diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b2d594e75..8d76dc9fd 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml
index a612050d0..1ccf95af5 100644
--- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:animated-vector-drawable-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.1.aar/e4cde6352a229df6a181781a182aaf97/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.1.aar/e4cde6352a229df6a181781a182aaf97/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.1.aar/7eff9a044ecf1340970e640aa2b9236e/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.1.aar/7eff9a044ecf1340970e640aa2b9236e/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml
index d18db2c08..a9b92f2c5 100644
--- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:appcompat-v7-27.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.1.aar/b917b25f8b90f07d7678b5c0615d5826/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.1.aar/b917b25f8b90f07d7678b5c0615d5826/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.1.aar/7d080eab91e9bced0999838b987f84c9/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.1.aar/7d080eab91e9bced0999838b987f84c9/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml
index f6b773369..b9e7fbe35 100644
--- a/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_cardview_v7_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:cardview-v7-27.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-27.1.1.aar/6cdcbac793fe7954dd9dd2d8fcf95cde/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-27.1.1.aar/6cdcbac793fe7954dd9dd2d8fcf95cde/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-27.1.1.aar/b28b41837787e97479fd5347bec8ae4c/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/cardview-v7-27.1.1.aar/b28b41837787e97479fd5347bec8ae4c/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml
index 8d630570b..8c3dac341 100644
--- a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml
+++ b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support.constraint:constraint-layout-1.1.0">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/21abce687d6605dd960338c93997a5a3/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/21abce687d6605dd960338c93997a5a3/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/50958d35504ec263bd642543ed700576/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.0.aar/50958d35504ec263bd642543ed700576/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml
index a477b049b..040741ba9 100644
--- a/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:design-27.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-27.1.1.aar/ae6a8827ff89f33c75eaa6690dff80f6/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-27.1.1.aar/ae6a8827ff89f33c75eaa6690dff80f6/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-27.1.1.aar/4dd8ca0c1ee5643b2fcf1c20f7edcc24/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-27.1.1.aar/4dd8ca0c1ee5643b2fcf1c20f7edcc24/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml
index 4f6f986bf..7f4396fa8 100644
--- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:recyclerview-v7-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.1.aar/1c5344eff3c390eac2ff50503a4a7608/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.1.aar/1c5344eff3c390eac2ff50503a4a7608/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.1.aar/82ff56aa673bf36c87860ad285e48b1f/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.1.aar/82ff56aa673bf36c87860ad285e48b1f/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml
index 67910ff77..c2aac977d 100644
--- a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-compat-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/98d845b46807a158bba42def2b240a8d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/98d845b46807a158bba42def2b240a8d/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/7954e47e891ba64a2c93d7a6e2eab2e2/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.1.aar/7954e47e891ba64a2c93d7a6e2eab2e2/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml
index a3899f280..be615e403 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-ui-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/846e5112df139931f0f28510459c3375/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/846e5112df139931f0f28510459c3375/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/8aabeec984655b041204bafb243a993d/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.1.aar/8aabeec984655b041204bafb243a993d/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml
index 7ffc8e01f..576993dac 100644
--- a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-core-utils-27.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/f7b2d7d6b0afdd9a3a9061bdc66d6623/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/f7b2d7d6b0afdd9a3a9061bdc66d6623/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/a77c7b37ff76fbc9f9fd9043fb080fc4/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.1.aar/a77c7b37ff76fbc9f9fd9043fb080fc4/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml
index d6c3e27b3..35cf58adc 100644
--- a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-fragment-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/790994457d13c52fe00e603f8d00828f/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/790994457d13c52fe00e603f8d00828f/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/18039ffabc7b0a2074be8520594cbfa7/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.1.aar/18039ffabc7b0a2074be8520594cbfa7/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml
index fd20347a3..95915db36 100644
--- a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-media-compat-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/b0b43ae6fd102b970f0ca47cdfaec3f6/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/b0b43ae6fd102b970f0ca47cdfaec3f6/res" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/568a202db8883a6669320af9d24b6ae0/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.1.aar/568a202db8883a6669320af9d24b6ae0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml
index 5e95af576..3262fca70 100644
--- a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-v4-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/fb2f40755ff79029e222b6666b360ecf/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/fb2f40755ff79029e222b6666b360ecf/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/c5fe5d908b2c1f0a8cd5cc24d5eec635/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.1.aar/c5fe5d908b2c1f0a8cd5cc24d5eec635/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml
index 1cc8bfa83..d202ee5bc 100644
--- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:support-vector-drawable-27.1.1">
     <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.1.aar/267cc7f570ca21ab6caf10e474ddf1d7/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.1.aar/267cc7f570ca21ab6caf10e474ddf1d7/jars/classes.jar!/" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.1.aar/23aa4def04bd6a917af2f8fc880c4d4a/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.1.aar/23aa4def04bd6a917af2f8fc880c4d4a/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml
index 81aac2fc4..39c6d9976 100644
--- a/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml
+++ b/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="Gradle: com.android.support:transition-27.1.1">
     <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-27.1.1.aar/1932b7770bea83cbc526c937da7c6a5b/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-27.1.1.aar/1932b7770bea83cbc526c937da7c6a5b/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-27.1.1.aar/29c119ca9e777152df37f00e0fd12d36/jars/classes.jar!/" />
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/transition-27.1.1.aar/29c119ca9e777152df37f00e0fd12d36/res" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/libraries/Gradle__com_codemybrainsout_onboarding_onboarder_1_0_4.xml b/.idea/libraries/Gradle__com_codemybrainsout_onboarding_onboarder_1_0_4.xml
new file mode 100644
index 000000000..53493ea74
--- /dev/null
+++ b/.idea/libraries/Gradle__com_codemybrainsout_onboarding_onboarder_1_0_4.xml
@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="Gradle: com.codemybrainsout.onboarding:onboarder-1.0.4">
+    <CLASSES>
+      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/onboarder-1.0.4.aar/f34a23c19e9d3e02adc0a30e5309dda8/res" />
+      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/onboarder-1.0.4.aar/f34a23c19e9d3e02adc0a30e5309dda8/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.codemybrainsout.onboarding/onboarder/1.0.4/8752e3dd3e6d2a9f65feba7ecfcd1b8976f901d0/onboarder-1.0.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_ramotion_paperonboarding_paper_onboarding_1_1_1.xml b/.idea/libraries/Gradle__com_ramotion_paperonboarding_paper_onboarding_1_1_1.xml
deleted file mode 100644
index 3dab613cf..000000000
--- a/.idea/libraries/Gradle__com_ramotion_paperonboarding_paper_onboarding_1_1_1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.ramotion.paperonboarding:paper-onboarding-1.1.1">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/paper-onboarding-1.1.1.aar/7347b9cfd5fc7a3ecedcb171743542df/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/paper-onboarding-1.1.1.aar/7347b9cfd5fc7a3ecedcb171743542df/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3c43b87c4..cd4103b29 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -32,8 +32,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8e886c41-2ca4-4f09-a790-00ea2865c607" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
+      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change beforePath="$PROJECT_DIR$/app/release/output.json" afterPath="$PROJECT_DIR$/app/release/output.json" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
     </list>
     <ignored path="Anitrend.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -76,84 +82,11 @@
     <favorites_list name="Anitrend" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="adapter_anime.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_anime.xml">
-          <provider editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="332">
-              <caret line="60" column="55" lean-forward="false" selection-start-line="60" selection-start-column="55" selection-end-line="60" selection-end-column="55" />
-              <folding>
-                <element signature="e#669#687#0" expanded="true" />
-                <element signature="e#893#911#0" expanded="true" />
-                <element signature="e#941#959#0" expanded="true" />
-                <element signature="e#987#1011#0" expanded="true" />
-                <element signature="e#1759#1777#0" expanded="true" />
-                <element signature="e#1940#1958#0" expanded="true" />
-                <element signature="e#2686#2704#0" expanded="true" />
-                <element signature="e#3222#3240#0" expanded="true" />
-                <element signature="e#3473#3491#0" expanded="true" />
-                <element signature="e#4149#4167#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="adapter_manga.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_manga.xml">
-          <provider editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="221">
-              <caret line="40" column="28" lean-forward="false" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
-              <folding>
-                <element signature="e#726#744#0" expanded="true" />
-                <element signature="e#1816#1834#0" expanded="true" />
-                <element signature="e#2934#2952#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="adapter_series.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series.xml">
-          <provider editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="33" column="51" lean-forward="false" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
-              <folding>
-                <element signature="e#669#687#0" expanded="true" />
-                <element signature="e#2877#2895#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="adapter_series_airing.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series_airing.xml">
-          <provider editor-type-id="android-designer2">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="646">
-              <caret line="47" column="63" lean-forward="false" selection-start-line="47" selection-start-column="63" selection-end-line="47" selection-end-column="63" />
-              <folding>
-                <element signature="e#3243#3261#0" expanded="true" />
-                <element signature="e#4030#4048#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
+    <leaf>
       <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
+            <state relative-caret-position="65">
               <caret line="8" column="28" lean-forward="false" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
               <folding />
             </state>
@@ -171,22 +104,13 @@
         <option value="Interface" />
         <option value="Singleton" />
         <option value="layoutResourceFile" />
-        <option value="Class" />
         <option value="resourceFile" />
+        <option value="Class" />
       </list>
     </option>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>series</find>
-      <find>durat</find>
-      <find>externalLinks</find>
-      <find>makeRequest</find>
-      <find>Search</find>
-      <find>viewModel</find>
-      <find>|</find>
-      <find>Share</find>
-      <find>Shared</find>
       <find>Series</find>
       <find>QueryContainer</find>
       <find>text_unable_to_loa</find>
@@ -208,10 +132,17 @@
       <find>setOnClickListener</find>
       <find>Notif</find>
       <find>AniList</find>
+      <find>Episodes</find>
+      <find>Chapters</find>
+      <find>messageBase</find>
+      <find>media_sources</find>
+      <find>KeyUtil</find>
+      <find>series_sort_types</find>
+      <find>media_list_status</find>
+      <find>pref_values_menu_entries</find>
+      <find>24dp</find>
     </findStrings>
     <replaceStrings>
-      <replace>KeyUtils.NOTIFICATION_</replace>
-      <replace>binding.notificationSubject</replace>
       <replace>binding.notificationContent</replace>
       <replace>KeyUtils.NOTIFICATION</replace>
       <replace>intent</replace>
@@ -240,6 +171,8 @@
       <replace>CompatUtils</replace>
       <replace>CompatUtil</replace>
       <replace>!CompatUtil.isEmpty(model)</replace>
+      <replace>message</replace>
+      <replace>48dp</replace>
     </replaceStrings>
   </component>
   <component name="GenerateSignedApkSettings">
@@ -2546,56 +2479,56 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaOverviewFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Browse/Query/ReviewBrowse.graphql" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_anime.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_manga.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_series.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_series_airing.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesYearTypeTextView.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java" />
+        <option value="$PROJECT_DIR$/app/src/main/res/xml/pref_general.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/AnalyticsUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/SettingsActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/base/VersionBase.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/api/retro/base/RepositoryModel.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/index/SplashActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/GraphUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/presenter/base/BasePresenter.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/SuggestionListFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/User/Query/Notifications/UserNotifications.graphql" />
+        <option value="$PROJECT_DIR$/app/src/main/res/menu/shared_menu.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/anilist/MediaTag.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/ApplicationPref.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/AiringListFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/BrowseReviewFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Studio/Query/StudioMedia.graphql" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/StudioMediaFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaListFragment.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/StaffActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/CharacterActivity.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/container/body/PageContainer.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/api/retro/anilist/UserModel.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/index/MainActivity.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/NotificationActivity.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/anilist/Notification.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/container/body/Container.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/sheet/BottomSheetList.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AboutPanelWidget.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/values-it/strings.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/values-ar/strings.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationBase.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/data/DatabaseHelper.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java" />
         <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
+        <option value="$PROJECT_DIR$/app/build.gradle" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Query/FeedListReply.graphql" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetComposer.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/FeedListFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/editor/ComposerWidget.java" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveTextActivity.graphql" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveActivityReply.graphql" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveMessageActivity.graphql" />
-        <option value="$PROJECT_DIR$/app/src/main/res/drawable/counter_container.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/section_series_details.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/presenter/fragment/MediaPresenter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/MediaUtil.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RatingTextView.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/index/MediaAdapter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/index/AiringAdapter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupSeriesAdapter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupMediaAdapter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaFormatFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupSeriesListAdapter.java" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java" />
-        <option value="$PROJECT_DIR$/app/src/main/assets/graphql/Browse/Query/ReviewBrowse.graphql" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_anime.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_manga.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_series.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/res/layout/adapter_series_airing.xml" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java" />
         <option value="$PROJECT_DIR$/build.gradle" />
       </list>
     </option>
@@ -2620,7 +2553,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
+      <pane id="ProjectPane" />
+      <pane id="Scope" />
       <pane id="AndroidView">
         <subPane>
           <expand>
@@ -2642,28 +2576,7 @@
             <path>
               <item name="anitrend-app" type="1abcf292:AndroidViewProjectNode" />
               <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="assets" type="edd41e36:AndroidSourceTypeNode" />
-            </path>
-            <path>
-              <item name="anitrend-app" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="assets" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="graphql" type="cbb59c9e:AndroidPsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="anitrend-app" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="assets" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="graphql" type="cbb59c9e:AndroidPsiDirectoryNode" />
-              <item name="Browse" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="anitrend-app" type="1abcf292:AndroidViewProjectNode" />
-              <item name="app" type="feadf853:AndroidModuleNode" />
-              <item name="assets" type="edd41e36:AndroidSourceTypeNode" />
-              <item name="graphql" type="cbb59c9e:AndroidPsiDirectoryNode" />
-              <item name="Browse" type="462c0819:PsiDirectoryNode" />
-              <item name="Query" type="462c0819:PsiDirectoryNode" />
+              <item name="res" type="d4f16f75:AndroidResFolderNode" />
             </path>
             <path>
               <item name="anitrend-app" type="1abcf292:AndroidViewProjectNode" />
@@ -2673,24 +2586,23 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
     <property name="settings.editor.selected.configurable" value="instant.run" />
-    <property name="SearchEverywhereHistoryKey" value="MediaBr&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;adapter_series&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_series.xml&#10;adapter_ser&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_series_airing.xml&#10;adapter_ma&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_manga.xml&#10;MediaPre&#9;PSI&#9;JAVA://com.mxt.anitrend.presenter.fragment.MediaPresenter&#10;MediaU&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaUtil&#10;Compo&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/editor/ComposerWidget.java&#10;Message&#9;PSI&#9;JAVA://com.mxt.anitrend.view.fragment.detail.MessageFeedFragment&#10;Commen&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java&#10;Composer&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.editor.ComposerWidget&#10;MediaStat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java&#10;Wel&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.base.WelcomeActivity&#10;Comment&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java&#10;Media&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;Incre&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.widget.AutoIncrementWidget&#10;MediaAct&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaActionUtil&#10;Notifi&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/model/entity/anilist/Notification.java&#10;Widge&#9;PSI&#9;JAVA://com.mxt.anitrend.databinding.WidgetAvatarIndicatorBinding&#10;Medi&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;Key&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java&#10;fragment_stat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/fragment_series_stats.xml&#10;Profil&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Stat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Avatar&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java&#10;Compat&#9;PSI&#9;JAVA://com.mxt.anitrend.util.CompatUtil&#10;ProfileStat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Share&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.base.SharedContentActivity&#10;Frag&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java&#10;Feed&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/FeedListFragment.java&#10;Dialog&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaDialogUtil&#10;Base&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/consumer/BaseConsumer.java&#10;Widget&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AutoIncrementWidget.java&#10;auto&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/widget_auto_incrementer.xml&#10;incre&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/widget_auto_incrementer.xml&#10;ProfileActi&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.ProfileActivity&#10;ActivityBas&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.activity.ActivityBase&#10;MediaList&#9;PSI&#9;JAVA://com.mxt.anitrend.model.entity.anilist.MediaList&#10;User&#9;PSI&#9;JAVA://com.mxt.anitrend.model.entity.anilist.User&#10;CustomRatingWidget&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/custom_rating_widget.xml&#10;Mark&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/util/MarkDown.java&#10;Wid&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/image/WideImageView.java&#10;Auth&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/model/api/interceptor/AuthInterceptor.java&#10;Token&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/async/WebTokenRequest.java&#10;Wide&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.image.WideImageView&#10;Avat&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.image.AvatarImageView&#10;custom_recycler&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/custom_recycler_loading.xml&#10;GraphQ&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/model/api/converter/GraphQLConverter.java&#10;FeedPa&#9;PSI&#9;JAVA://com.mxt.anitrend.adapter.pager.index.FeedPageAdapter&#10;widget_auto&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/widget_auto_incrementer.xml&#10;Vote&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.widget.VoteWidget" />
+    <property name="SearchEverywhereHistoryKey" value="MediaAc&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.MediaActivity&#10;Welcom&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java&#10;Welco&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.base.WelcomeActivity&#10;CompatU&#9;PSI&#9;JAVA://com.mxt.anitrend.util.CompatUtil&#10;Searc&#9;PSI&#9;JAVA://com.mxt.anitrend.adapter.pager.index.SearchPageAdapter&#10;BottomSheetLikes&#9;PSI&#9;JAVA://com.mxt.anitrend.R.string#title_bottom_sheet_likes&#10;UserOver&#9;PSI&#9;JAVA://com.mxt.anitrend.view.fragment.detail.UserOverviewFragment&#10;Avatar&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.image.AvatarIndicatorView&#10;MediaActi&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.MediaActivity&#10;MediaLi&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.MediaListActivity&#10;Studio&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.StudioActivity&#10;MediaPr&#9;PSI&#9;JAVA://com.mxt.anitrend.presenter.fragment.MediaPresenter&#10;MainA&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.index.MainActivity&#10;Sugges&#9;PSI&#9;JAVA://com.mxt.anitrend.view.fragment.list.SuggestionListFragment&#10;Airing&#9;PSI&#9;JAVA://com.mxt.anitrend.adapter.recycler.index.AiringAdapter&#10;Review&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/adapter/pager/index/ReviewPageAdapter.java&#10;A&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java&#10;Anal&#9;PSI&#9;JAVA://com.mxt.anitrend.util.AnalyticsUtil&#10;AppPre&#9;PSI&#9;JAVA://com.mxt.anitrend.util.ApplicationPref&#10;NotificationHi&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java&#10;NotificationAc&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.detail.NotificationActivity&#10;MediaBr&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;adapter_series&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_series.xml&#10;adapter_ser&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_series_airing.xml&#10;adapter_ma&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/adapter_manga.xml&#10;MediaPre&#9;PSI&#9;JAVA://com.mxt.anitrend.presenter.fragment.MediaPresenter&#10;MediaU&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaUtil&#10;Compo&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/editor/ComposerWidget.java&#10;Message&#9;PSI&#9;JAVA://com.mxt.anitrend.view.fragment.detail.MessageFeedFragment&#10;Commen&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java&#10;Composer&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.editor.ComposerWidget&#10;MediaStat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java&#10;Wel&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.base.WelcomeActivity&#10;Comment&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java&#10;Media&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;Incre&#9;PSI&#9;JAVA://com.mxt.anitrend.base.custom.view.widget.AutoIncrementWidget&#10;MediaAct&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaActionUtil&#10;Notifi&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/model/entity/anilist/Notification.java&#10;Widge&#9;PSI&#9;JAVA://com.mxt.anitrend.databinding.WidgetAvatarIndicatorBinding&#10;Medi&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java&#10;Key&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java&#10;fragment_stat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/res/layout/fragment_series_stats.xml&#10;Profil&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Stat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Compat&#9;PSI&#9;JAVA://com.mxt.anitrend.util.CompatUtil&#10;ProfileStat&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/ProfileStatsWidget.java&#10;Share&#9;PSI&#9;JAVA://com.mxt.anitrend.view.activity.base.SharedContentActivity&#10;Frag&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java&#10;Feed&#9;FILE&#9;file:///home/max/Documents/GitHub/anitrend-app/app/src/main/java/com/mxt/anitrend/view/fragment/list/FeedListFragment.java&#10;Dialog&#9;PSI&#9;JAVA://com.mxt.anitrend.util.MediaDialogUtil" />
     <property name="device.picker.selection" value="Nexus_5X_API_26" />
-    <property name="DEBUGGABLE_DEVICE" value="Nexus_5X_API_26 [emulator-5554]" />
+    <property name="DEBUGGABLE_DEVICE" value="emulator-5554" />
     <property name="DEBUGGABLE_PROCESS" value="com.mxt.anitrend" />
     <property name="SHOW_ALL_PROCESSES" value="false" />
     <property name="DEBUGGER_ID" value="Auto" />
     <property name="android.project.structure.last.selected" value="app" />
     <property name="android.project.structure.proportion" value="0.15" />
-    <property name="last_opened_file_path" value="$USER_HOME$/Videos" />
-    <property name="ScreenshotViewer.SavePath" value="$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../anitrend-resources/screenshots" />
+    <property name="ScreenshotViewer.SavePath" value="$PROJECT_DIR$/../anitrend-resources/screenshots" />
     <property name="VectorAssetImportPath" value="$USER_HOME$/Downloads" />
     <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" />
     <property name="ExportApk.Flavors" value="" />
@@ -2701,7 +2613,7 @@
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
     <property name="last.edited.regexp" value="Sample asdf Text" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1525047388848" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1525122671168" />
   </component>
   <component name="RecentsManager">
     <key name="CreateTestDialog.RecentsKey">
@@ -3243,23 +3155,22 @@
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21024546" sideWeight="0.5059459" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36972973" sideWeight="0.5154749" order="14" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31675676" sideWeight="0.5096051" order="14" side_tool="true" content_ui="tabs" />
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30843115" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32864866" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36864865" sideWeight="0.48452508" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36756757" sideWeight="0.48452508" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20437567" sideWeight="0.49405405" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31675676" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32540542" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20437567" sideWeight="0.49405405" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31675676" sideWeight="0.4903949" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977587" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2497332" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39783785" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977587" sideWeight="0.5" order="13" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977587" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39783785" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21024546" sideWeight="0.50378376" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -3267,6 +3178,7 @@
       <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32901832" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Assistant" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977587" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
       <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32977587" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
@@ -3276,6 +3188,7 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Thumbnails" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32901832" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="13" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32540542" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.5416216" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -3365,514 +3278,373 @@
           <properties />
           <option name="timeStamp" value="787" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java</url>
+          <line>206</line>
+          <properties />
+          <option name="timeStamp" value="808" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java</url>
+          <line>116</line>
+          <properties />
+          <option name="timeStamp" value="810" />
+        </line-breakpoint>
       </breakpoints>
-      <option name="time" value="798" />
+      <option name="time" value="814" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="367">
-          <caret line="434" column="60" lean-forward="true" selection-start-line="434" selection-start-column="60" selection-end-line="434" selection-end-column="60" />
+        <state relative-caret-position="7633">
+          <caret line="499" column="21" lean-forward="false" selection-start-line="499" selection-start-column="21" selection-end-line="499" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/build/generated/source/apt/debug/com/mxt/anitrend/model/entity/base/NotificationHistoryCursor.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="333">
-          <caret line="45" column="56" lean-forward="false" selection-start-line="45" selection-start-column="56" selection-end-line="45" selection-end-column="56" />
+        <state relative-caret-position="389">
+          <caret line="361" column="19" lean-forward="false" selection-start-line="361" selection-start-column="19" selection-end-line="361" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-de/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="200" column="33" lean-forward="true" selection-start-line="200" selection-start-column="33" selection-end-line="204" selection-end-column="49" />
-          <folding>
-            <element signature="method#onChanged#0;class#MediaStatsFragment#0" expanded="false" />
-            <element signature="method#configureSeriesStats#0;class#MediaStatsFragment#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="287">
+          <caret line="361" column="19" lean-forward="false" selection-start-line="361" selection-start-column="19" selection-end-line="361" selection-end-column="19" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-ar/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="67" column="67" lean-forward="false" selection-start-line="67" selection-start-column="67" selection-end-line="67" selection-end-column="67" />
+        <state relative-caret-position="118">
+          <caret line="364" column="4" lean-forward="false" selection-start-line="364" selection-start-column="4" selection-end-line="364" selection-end-column="4" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
-          <folding>
-            <element signature="e#644#645#0" expanded="false" />
-            <element signature="e#683#684#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="179">
+          <caret line="316" column="68" lean-forward="false" selection-start-line="316" selection-start-column="68" selection-end-line="316" selection-end-column="68" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="92" column="82" lean-forward="false" selection-start-line="92" selection-start-column="82" selection-end-line="92" selection-end-column="82" />
-          <folding>
-            <element signature="e#5679#5839#0" expanded="false" />
-            <element signature="e#6305#6342#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="206">
+          <caret line="130" column="61" lean-forward="true" selection-start-line="130" selection-start-column="61" selection-end-line="130" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/index/FeedAdapter.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="398">
-          <caret line="91" column="5" lean-forward="true" selection-start-line="91" selection-start-column="5" selection-end-line="91" selection-end-column="5" />
+        <state relative-caret-position="355">
+          <caret line="362" column="19" lean-forward="false" selection-start-line="362" selection-start-column="19" selection-end-line="362" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Query/FeedListReply.graphql">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/values-it/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="523">
-          <caret line="261" column="0" lean-forward="true" selection-start-line="261" selection-start-column="0" selection-end-line="261" selection-end-column="0" />
+        <state relative-caret-position="251">
+          <caret line="348" column="0" lean-forward="false" selection-start-line="348" selection-start-column="0" selection-end-line="360" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBaseComment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="340" column="16" lean-forward="false" selection-start-line="340" selection-start-column="16" selection-end-line="340" selection-end-column="16" />
-          <folding>
-            <element signature="e#13189#13230#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/recycler/RecyclerViewAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="235" column="0" lean-forward="false" selection-start-line="235" selection-start-column="0" selection-end-line="235" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="653" column="18" lean-forward="false" selection-start-line="653" selection-start-column="18" selection-end-line="653" selection-end-column="18" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetComposer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="379">
-          <caret line="99" column="40" lean-forward="false" selection-start-line="99" selection-start-column="40" selection-end-line="99" selection-end-column="40" />
+        <state relative-caret-position="-561">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/FeedListFragment.java">
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.support/appcompat-v7/27.1.1/21d073509c5f8d25a1bf274067fa729a1fba8d75/appcompat-v7-27.1.1-sources.jar!/android/support/v7/widget/AppCompatImageView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="338">
-          <caret line="223" column="17" lean-forward="false" selection-start-line="223" selection-start-column="17" selection-end-line="223" selection-end-column="17" />
+        <state relative-caret-position="201">
+          <caret line="55" column="13" lean-forward="false" selection-start-line="55" selection-start-column="13" selection-end-line="55" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_notification_dot.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="96" column="0" lean-forward="false" selection-start-line="96" selection-start-column="0" selection-end-line="96" selection-end-column="0" />
-          <folding>
-            <element signature="e#3554#3580#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/CommentFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="311">
-          <caret line="262" column="17" lean-forward="false" selection-start-line="262" selection-start-column="17" selection-end-line="262" selection-end-column="17" />
-          <folding>
-            <element signature="e#2678#2702#0" expanded="false" />
-            <element signature="e#3555#3585#0" expanded="false" />
-            <element signature="e#3857#3890#0" expanded="false" />
-            <element signature="e#7101#7134#0" expanded="false" />
-            <element signature="e#7291#7313#0" expanded="false" />
-            <element signature="e#9364#9397#0" expanded="false" />
-            <element signature="e#9602#9624#0" expanded="false" />
-            <element signature="e#10773#10796#0" expanded="false" />
-            <element signature="e#12426#12453#0" expanded="false" />
-            <element signature="e#13347#13374#0" expanded="false" />
-            <element signature="e#13376#13406#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_ranking.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="60" column="7" lean-forward="false" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
+        <state relative-caret-position="-204">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveActivityReply.graphql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_notification.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveTextActivity.graphql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="75" lean-forward="false" selection-start-line="0" selection-start-column="75" selection-end-line="0" selection-end-column="75" />
+        <state relative-caret-position="255">
+          <caret line="15" column="41" lean-forward="false" selection-start-line="15" selection-start-column="41" selection-end-line="15" selection-end-column="41" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/assets/graphql/Feed/Mutation/SaveMessageActivity.graphql">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AppCompatTintImageView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="100" lean-forward="false" selection-start-line="0" selection-start-column="100" selection-end-line="0" selection-end-column="100" />
+        <state relative-caret-position="136">
+          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/editor/ComposerWidget.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_staff.xml">
+      <provider editor-type-id="android-designer2">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="244" column="18" lean-forward="false" selection-start-line="244" selection-start-column="18" selection-end-line="244" selection-end-column="18" />
-          <folding>
-            <element signature="e#7664#7689#0" expanded="false" />
-            <element signature="e#8081#8109#0" expanded="false" />
-            <element signature="e#8241#8268#0" expanded="false" />
-          </folding>
+        <state relative-caret-position="519">
+          <caret line="64" column="57" lean-forward="true" selection-start-line="64" selection-start-column="57" selection-end-line="64" selection-end-column="57" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/build/generated/source/apt/debug/com/mxt/anitrend/databinding/AdapterMediaHeaderBinding.java">
+    <entry file="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/design-27.1.1.aar/4dd8ca0c1ee5643b2fcf1c20f7edcc24/res/values/values.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="161" column="122" lean-forward="false" selection-start-line="161" selection-start-column="122" selection-end-line="161" selection-end-column="122" />
+        <state relative-caret-position="299">
+          <caret line="166" column="18" lean-forward="false" selection-start-line="166" selection-start-column="18" selection-end-line="166" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_media_header.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_view_pager.xml">
       <provider editor-type-id="android-designer2">
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="35" lean-forward="true" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
+        <state relative-caret-position="102">
+          <caret line="6" column="41" lean-forward="true" selection-start-line="6" selection-start-column="41" selection-end-line="6" selection-end-column="41" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/section_series_details.xml">
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/container/CardViewBase.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4505">
-          <caret line="265" column="43" lean-forward="false" selection-start-line="265" selection-start-column="43" selection-end-line="265" selection-end-column="43" />
-          <folding />
+        <state relative-caret-position="108">
+          <caret line="23" column="13" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/MediaUtil.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/image/HeaderImageView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="652">
-          <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+        <state relative-caret-position="-17">
+          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/presenter/fragment/MediaPresenter.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_welcome.xml" />
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.codemybrainsout.onboarding/onboarder/1.0.4/8752e3dd3e6d2a9f65feba7ecfcd1b8976f901d0/onboarder-1.0.4-sources.jar!/com/codemybrainsout/onboarder/AhoyOnboarderCard.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="79" column="99" lean-forward="false" selection-start-line="79" selection-start-column="82" selection-end-line="79" selection-end-column="99" />
-          <folding />
+        <state relative-caret-position="299">
+          <caret line="40" column="11" lean-forward="false" selection-start-line="40" selection-start-column="11" selection-end-line="40" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series_staff.xml">
-      <provider editor-type-id="android-designer2">
+    <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
+      <provider editor-type-id="android-manifest">
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-323">
-          <caret line="8" column="37" lean-forward="false" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
+        <state relative-caret-position="289">
+          <caret line="175" column="32" lean-forward="false" selection-start-line="175" selection-start-column="32" selection-end-line="175" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series_character.xml">
-      <provider editor-type-id="android-designer2">
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Nexus5X/device-2018-04-30-223501.png" />
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Nexus5X/device-2018-04-30-223537.png" />
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Nexus5X/device-2018-04-30-223614.png" />
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-223802.png">
+      <provider selected="true" editor-type-id="images">
         <state />
       </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="77" column="48" lean-forward="false" selection-start-line="77" selection-start-column="48" selection-end-line="77" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/counter_container.xml">
-      <provider editor-type-id="android-designer2">
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-223825.png">
+      <provider selected="true" editor-type-id="images">
         <state />
       </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="8" lean-forward="true" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
-          <folding />
-        </state>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-223850.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RatingTextView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="71" column="55" lean-forward="false" selection-start-line="71" selection-start-column="55" selection-end-line="71" selection-end-column="55" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-223933.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AutoIncrementWidget.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="95" column="16" lean-forward="false" selection-start-line="95" selection-start-column="16" selection-end-line="95" selection-end-column="16" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224000.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/index/AiringAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="37" column="81" lean-forward="true" selection-start-line="37" selection-start-column="81" selection-end-line="37" selection-end-column="81" />
-          <folding>
-            <element signature="class#AiringViewHolder#0;class#AiringAdapter#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224028.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/group/CharacterActorsFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="61" column="27" lean-forward="false" selection-start-line="61" selection-start-column="27" selection-end-line="61" selection-end-column="27" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224051.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/shared/GroupMediaViewHolder.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="28" lean-forward="true" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224147.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/util/GroupingUtil.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="41" column="36" lean-forward="false" selection-start-line="41" selection-start-column="36" selection-end-line="41" selection-end-column="36" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224132.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaFormatFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="46" lean-forward="false" selection-start-line="9" selection-start-column="46" selection-end-line="9" selection-end-column="46" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224210.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="48" column="38" lean-forward="false" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224239.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupMediaAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="27" selection-end-line="26" selection-end-column="27" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224300.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupStaffRoleAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-          <folding>
-            <element signature="class#StaffViewHolder#0;class#GroupStaffRoleAdapter#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224340.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupSeriesListAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="48" column="92" lean-forward="false" selection-start-line="48" selection-start-column="92" selection-end-line="48" selection-end-column="92" />
-          <folding>
-            <element signature="e#1302#1303#0" expanded="false" />
-            <element signature="e#1348#1349#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224421.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupActorAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="30" column="22" lean-forward="false" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
-          <folding>
-            <element signature="class#StaffViewHolder#0;class#GroupActorAdapter#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-224403.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupCharacterAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-          <folding />
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/Pixel/device-2018-04-30-225806.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="66" column="104" lean-forward="false" selection-start-line="66" selection-start-column="104" selection-end-line="66" selection-end-column="104" />
-          <folding>
-            <element signature="e#2540#2562#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/device-2018-04-30-225833.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="36" column="23" lean-forward="false" selection-start-line="36" selection-start-column="23" selection-end-line="36" selection-end-column="23" />
-          <folding>
-            <element signature="e#1006#1007#0" expanded="false" />
-            <element signature="e#1036#1037#0" expanded="false" />
-          </folding>
-        </state>
+    <entry file="file://$PROJECT_DIR$/../anitrend-resources/screenshots/device-2018-04-30-225816.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/index/MediaAdapter.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="15" column="35" lean-forward="false" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
+        <state relative-caret-position="340">
+          <caret line="36" column="8" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="73" />
           <folding>
-            <element signature="class#AnimeViewHolder#0;class#MediaAdapter#0" expanded="false" />
-            <element signature="class#MangaViewHolder#0;class#MediaAdapter#0" expanded="false" />
-            <element signature="class#MediaViewHolder#0;class#MediaAdapter#0" expanded="false" />
+            <element signature="e#1339#1340#0" expanded="false" />
+            <element signature="e#1419#1420#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/recycler/group/GroupSeriesAdapter.java">
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="14" column="35" lean-forward="false" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+        <state relative-caret-position="323">
+          <caret line="34" column="27" lean-forward="false" selection-start-line="34" selection-start-column="27" selection-end-line="34" selection-end-column="27" />
           <folding>
-            <element signature="class#SeriesViewHolder#0;class#GroupSeriesAdapter#0" expanded="false" />
+            <element signature="e#1357#1358#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/assets/graphql/Browse/Query/ReviewBrowse.graphql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="527">
-          <caret line="52" column="23" lean-forward="false" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="23" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_anime.xml">
+    <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/media_base_menu.xml">
       <provider editor-type-id="android-designer2">
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="332">
-          <caret line="60" column="55" lean-forward="false" selection-start-line="60" selection-start-column="55" selection-end-line="60" selection-end-column="55" />
-          <folding>
-            <element signature="e#669#687#0" expanded="true" />
-            <element signature="e#893#911#0" expanded="true" />
-            <element signature="e#941#959#0" expanded="true" />
-            <element signature="e#987#1011#0" expanded="true" />
-            <element signature="e#1759#1777#0" expanded="true" />
-            <element signature="e#1940#1958#0" expanded="true" />
-            <element signature="e#2686#2704#0" expanded="true" />
-            <element signature="e#3222#3240#0" expanded="true" />
-            <element signature="e#3473#3491#0" expanded="true" />
-            <element signature="e#4149#4167#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="476">
+          <caret line="28" column="50" lean-forward="false" selection-start-line="28" selection-start-column="33" selection-end-line="28" selection-end-column="50" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_manga.xml">
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="40" column="28" lean-forward="false" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
-          <folding>
-            <element signature="e#726#744#0" expanded="true" />
-            <element signature="e#1816#1834#0" expanded="true" />
-            <element signature="e#2934#2952#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="578">
+          <caret line="103" column="47" lean-forward="false" selection-start-line="103" selection-start-column="47" selection-end-line="103" selection-end-column="47" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series.xml">
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="33" column="51" lean-forward="false" selection-start-line="33" selection-start-column="51" selection-end-line="33" selection-end-column="51" />
+        <state relative-caret-position="314">
+          <caret line="47" column="95" lean-forward="false" selection-start-line="47" selection-start-column="95" selection-end-line="47" selection-end-column="95" />
           <folding>
-            <element signature="e#669#687#0" expanded="true" />
-            <element signature="e#2877#2895#0" expanded="true" />
+            <element signature="e#2044#2086#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/adapter_series_airing.xml">
-      <provider editor-type-id="android-designer2">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/app/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
-          <caret line="47" column="63" lean-forward="false" selection-start-line="47" selection-start-column="63" selection-end-line="47" selection-end-column="63" />
-          <folding>
-            <element signature="e#3243#3261#0" expanded="true" />
-            <element signature="e#4030#4048#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="380">
+          <caret line="157" column="18" lean-forward="false" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
+        <state relative-caret-position="65">
           <caret line="8" column="28" lean-forward="false" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
           <folding />
         </state>
diff --git a/app/app.iml b/app/app.iml
index 521fce38a..8765d8ec3 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -88,20 +88,31 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_base_class_log_artifact" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_base_class_logs_dependency_artifacts" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processing-tools" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
@@ -177,6 +188,7 @@
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement-15.0.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.codemybrainsout.onboarding:onboarder-1.0.4" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.zzhoujay.markdown:markdown-1.0.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
@@ -203,7 +215,6 @@
     <orderEntry type="library" name="Gradle: __local_aars__:/home/max/Documents/GitHub/anitrend-app/app/libs/txtmark-0.16.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:disklrucache:2.0.2@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.ramotion.paperonboarding:paper-onboarding-1.1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder-4.7.1" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 400558546..2200bb1f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -168,7 +168,7 @@ dependencies {
     implementation 'com.github.rahatarmanahmed:circularprogressview:2.5.0'
 
     /** On-boarding Experience */
-    implementation 'com.ramotion.paperonboarding:paper-onboarding:1.1.1'
+    implementation 'com.codemybrainsout.onboarding:onboarder:1.0.4'
 
     /** Charts */
     implementation'com.github.PhilJay:MPAndroidChart:v3.0.3'
diff --git a/app/objectbox-models/default.json b/app/objectbox-models/default.json
index a80be5061..2d5365950 100644
--- a/app/objectbox-models/default.json
+++ b/app/objectbox-models/default.json
@@ -188,7 +188,7 @@
     },
     {
       "id": "20:4933134599609045281",
-      "lastPropertyId": "8:5813864838197118284",
+      "lastPropertyId": "9:1394444690792123339",
       "name": "MediaTag",
       "properties": [
         {
@@ -222,13 +222,17 @@
         {
           "id": "8:5813864838197118284",
           "name": "isAdult"
+        },
+        {
+          "id": "9:1394444690792123339",
+          "name": "isSelected"
         }
       ],
       "relations": []
     },
     {
       "id": "22:1353106754631402779",
-      "lastPropertyId": "2:5318626706316991999",
+      "lastPropertyId": "3:3919880449308635608",
       "name": "NotificationHistory",
       "properties": [
         {
@@ -236,9 +240,8 @@
           "name": "id"
         },
         {
-          "id": "2:5318626706316991999",
-          "indexId": "9:616734031870725147",
-          "name": "lastReadId"
+          "id": "3:3919880449308635608",
+          "name": "read"
         }
       ],
       "relations": []
@@ -271,7 +274,8 @@
     2490581992659279563,
     8099986486146876590,
     6452572299229966384,
-    8527992697025819419
+    8527992697025819419,
+    616734031870725147
   ],
   "retiredPropertyUids": [
     5808886818358913984,
@@ -439,7 +443,8 @@
     5943069004729972747,
     553857827249952188,
     1184187527879095143,
-    5508724948539347065
+    5508724948539347065,
+    5318626706316991999
   ],
   "retiredRelationUids": [],
   "version": 1
diff --git a/app/objectbox-models/default.json.bak b/app/objectbox-models/default.json.bak
index 088e37ed8..f644aa7ac 100644
--- a/app/objectbox-models/default.json.bak
+++ b/app/objectbox-models/default.json.bak
@@ -134,34 +134,6 @@
       ],
       "relations": []
     },
-    {
-      "id": "17:306565349058227920",
-      "lastPropertyId": "13:5508724948539347065",
-      "name": "NotificationBase",
-      "properties": [
-        {
-          "id": "1:4844262417148506219",
-          "name": "id"
-        },
-        {
-          "id": "8:5943069004729972747",
-          "name": "read"
-        },
-        {
-          "id": "11:553857827249952188",
-          "name": "type"
-        },
-        {
-          "id": "12:1184187527879095143",
-          "name": "createdAt"
-        },
-        {
-          "id": "13:5508724948539347065",
-          "name": "context"
-        }
-      ],
-      "relations": []
-    },
     {
       "id": "18:6103362073850748337",
       "lastPropertyId": "3:6737271375218349861",
@@ -253,10 +225,26 @@
         }
       ],
       "relations": []
+    },
+    {
+      "id": "22:1353106754631402779",
+      "lastPropertyId": "3:3919880449308635608",
+      "name": "NotificationHistory",
+      "properties": [
+        {
+          "id": "1:4804620542627180351",
+          "name": "id"
+        },
+        {
+          "id": "3:3919880449308635608",
+          "name": "read"
+        }
+      ],
+      "relations": []
     }
   ],
-  "lastEntityId": "21:5597106433451204540",
-  "lastIndexId": "8:8527992697025819419",
+  "lastEntityId": "22:1353106754631402779",
+  "lastIndexId": "9:616734031870725147",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",
   "modelVersion": 4,
@@ -274,14 +262,16 @@
     9088633577119353342,
     1021677628609453194,
     7606742837028811672,
-    5597106433451204540
+    5597106433451204540,
+    306565349058227920
   ],
   "retiredIndexUids": [
     4356584926379327934,
     2490581992659279563,
     8099986486146876590,
     6452572299229966384,
-    8527992697025819419
+    8527992697025819419,
+    616734031870725147
   ],
   "retiredPropertyUids": [
     5808886818358913984,
@@ -444,7 +434,13 @@
     4521045387923603177,
     1028517349533308976,
     8818665484947413382,
-    8044832169621340581
+    8044832169621340581,
+    4844262417148506219,
+    5943069004729972747,
+    553857827249952188,
+    1184187527879095143,
+    5508724948539347065,
+    5318626706316991999
   ],
   "retiredRelationUids": [],
   "version": 1
diff --git a/app/release/output.json b/app/release/output.json
index 63cb35eea..3ea24c1ca 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":75,"versionName":"1.0.7","enabled":true,"outputFile":"anitrend_v1.0.7_rc_75.apk","fullName":"release","baseName":"release"},"path":"anitrend_v1.0.7_rc_75.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":76,"versionName":"1.0.7","enabled":true,"outputFile":"anitrend_v1.0.7_rc_76.apk","fullName":"release","baseName":"release"},"path":"anitrend_v1.0.7_rc_76.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/assets/graphql/Studio/Query/StudioMedia.graphql b/app/src/main/assets/graphql/Studio/Query/StudioMedia.graphql
index eae652004..1f618e40f 100644
--- a/app/src/main/assets/graphql/Studio/Query/StudioMedia.graphql
+++ b/app/src/main/assets/graphql/Studio/Query/StudioMedia.graphql
@@ -1,6 +1,6 @@
-query StudioMedia($id: Int!, $page: Int, $perPage: Int, $seriesSort: [MediaSort] = POPULARITY) {
+query StudioMedia($id: Int!, $page: Int, $perPage: Int, $sort: [MediaSort] = POPULARITY) {
   Studio(id: $id) {
-    media(page: $page, perPage: $perPage, sort: $seriesSort) {
+    media(page: $page, perPage: $perPage, sort: $sort) {
       ... on MediaConnection {
         pageInfo {
           ... on PageInfo {
diff --git a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java
index c283c1c07..cdadb2d3c 100644
--- a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java
+++ b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/AnimePageAdapter.java
@@ -6,6 +6,7 @@
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.custom.pager.BaseStatePageAdapter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.view.fragment.detail.MediaFeedFragment;
@@ -23,9 +24,17 @@
 
 public class AnimePageAdapter extends BaseStatePageAdapter {
 
+    private boolean isAuthenticated;
+
     public AnimePageAdapter(FragmentManager fragmentManager, Context context) {
         super(fragmentManager, context);
         setPagerTitles(R.array.anime_page_titles);
+        isAuthenticated = new ApplicationPref(context).isAuthenticated();
+    }
+
+    @Override
+    public int getCount() {
+        return isAuthenticated ? super.getCount() : super.getCount() - 2;
     }
 
     /**
diff --git a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java
index d9c1598e1..b5515e42c 100644
--- a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java
+++ b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MangaPageAdapter.java
@@ -6,6 +6,7 @@
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.custom.pager.BaseStatePageAdapter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.view.fragment.detail.MediaFeedFragment;
@@ -22,9 +23,17 @@
 
 public class MangaPageAdapter extends BaseStatePageAdapter {
 
+    private boolean isAuthenticated;
+
     public MangaPageAdapter(FragmentManager fragmentManager, Context context) {
         super(fragmentManager, context);
         setPagerTitles(R.array.manga_page_titles);
+        isAuthenticated = new ApplicationPref(context).isAuthenticated();
+    }
+
+    @Override
+    public int getCount() {
+        return isAuthenticated ? super.getCount() : super.getCount() - 2;
     }
 
     /**
diff --git a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MessagePageAdapter.java b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MessagePageAdapter.java
index b8531b6e6..f7580c42f 100644
--- a/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MessagePageAdapter.java
+++ b/app/src/main/java/com/mxt/anitrend/adapter/pager/detail/MessagePageAdapter.java
@@ -1,13 +1,11 @@
 package com.mxt.anitrend.adapter.pager.detail;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.custom.pager.BaseStatePageAdapter;
-import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.view.fragment.detail.MessageFeedFragment;
 
diff --git a/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java b/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java
index 1d45ce2a2..79b364576 100644
--- a/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java
+++ b/app/src/main/java/com/mxt/anitrend/adapter/recycler/detail/NotificationAdapter.java
@@ -14,7 +14,6 @@
 import com.mxt.anitrend.base.custom.view.image.AspectImageView;
 import com.mxt.anitrend.databinding.AdapterNotificationBinding;
 import com.mxt.anitrend.model.entity.anilist.Notification;
-import com.mxt.anitrend.model.entity.base.NotificationBase;
 import com.mxt.anitrend.model.entity.base.NotificationHistory;
 import com.mxt.anitrend.model.entity.base.NotificationHistory_;
 import com.mxt.anitrend.util.CompatUtil;
@@ -34,12 +33,10 @@
 
 public class NotificationAdapter extends RecyclerViewAdapter<Notification> {
 
-    private long userId;
     private Box<NotificationHistory> historyBox;
 
     public NotificationAdapter(List<Notification> data, Context context) {
         super(data, context);
-        userId = presenter.getDatabase().getCurrentUser().getId();
         historyBox = presenter.getDatabase().getBoxStore(NotificationHistory.class);
     }
 
@@ -86,11 +83,11 @@ public NotificationHolder(AdapterNotificationBinding binding) {
         @Override
         public void onBindViewHolder(Notification model) {
             NotificationHistory notificationHistory = historyBox.query()
-                    .equal(NotificationHistory_.id, userId)
+                    .equal(NotificationHistory_.id, model.getId())
                     .build().findFirst();
 
             if(notificationHistory != null)
-                binding.notificationIndicator.setVisibility(notificationHistory.isNew(model.getId())? View.GONE:View.VISIBLE);
+                binding.notificationIndicator.setVisibility(View.GONE);
             else
                 binding.notificationIndicator.setVisibility(View.VISIBLE);
 
@@ -138,6 +135,11 @@ public void onBindViewHolder(Notification model) {
                     binding.notificationHeader.setText(model.getUser().getName());
                     binding.notificationContent.setText(model.getContext());
                     break;
+                case KeyUtil.ACTIVITY_REPLY:
+                    binding.notificationSubject.setText(R.string.notification_user_reply_activity);
+                    binding.notificationHeader.setText(model.getUser().getName());
+                    binding.notificationContent.setText(model.getContext());
+                    break;
                 case KeyUtil.ACTIVITY_REPLY_LIKE:
                     binding.notificationSubject.setText(R.string.notification_user_like_reply);
                     binding.notificationHeader.setText(model.getUser().getName());
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java b/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java
index bea4696e3..20154f6a0 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/activity/ActivityBase.java
@@ -26,13 +26,11 @@
 import com.miguelcatalan.materialsearchview.MaterialSearchView;
 import com.mxt.anitrend.App;
 import com.mxt.anitrend.R;
-import com.mxt.anitrend.base.custom.consumer.BaseConsumer;
 import com.mxt.anitrend.base.custom.fragment.FragmentBase;
 import com.mxt.anitrend.base.custom.presenter.CommonPresenter;
 import com.mxt.anitrend.base.custom.sheet.BottomSheetBase;
 import com.mxt.anitrend.base.custom.viewmodel.ViewModelBase;
 import com.mxt.anitrend.base.interfaces.event.ResponseCallback;
-import com.mxt.anitrend.model.entity.anilist.User;
 import com.mxt.anitrend.util.AnalyticsUtil;
 import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
@@ -44,8 +42,6 @@
 import com.mxt.anitrend.view.activity.index.SearchActivity;
 
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.Locale;
@@ -421,9 +417,6 @@ public boolean onQueryTextSubmit(String query) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(KeyUtil.arg_search, query);
             CompatUtil.startRevealAnim(this, mSearchView, intent);
-            Bundle bundle = new Bundle();
-            bundle.putString(KeyUtil.arg_search, query);
-            AnalyticsUtil.logEvent(getApplicationContext(), KeyUtil.arg_search, bundle);
             return true;
         }
         NotifyUtil.makeText(this, R.string.text_search_empty, Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/async/NotificationSyncTask.java b/app/src/main/java/com/mxt/anitrend/base/custom/async/NotificationSyncTask.java
index 8de546805..ffde6f073 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/async/NotificationSyncTask.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/async/NotificationSyncTask.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.mxt.anitrend.base.custom.consumer.BaseConsumer;
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java b/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java
index 9149297f7..60bb62225 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/async/RequestHandler.java
@@ -83,9 +83,7 @@ protected Call<T> doInBackground(Context... contexts) {
 
 
                 case UPDATE_CHECKER_REQ:
-                    if (param.containsKey(arg_branch_name))
-                        return (Call<T>) WebFactory.createRepositoryService().checkVersion(param.getString(arg_branch_name));
-                    return (Call<T>) WebFactory.createRepositoryService().checkVersion();
+                    return (Call<T>) WebFactory.createRepositoryService().checkVersion(param.getString(arg_branch_name));
 
 
                 case KeyUtil.MEDIA_BROWSE_REQ:
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java b/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java
index 29ead236d..2feb8257b 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java
@@ -22,7 +22,6 @@
 import android.view.ViewGroup;
 
 import com.mxt.anitrend.R;
-import com.mxt.anitrend.base.custom.consumer.BaseConsumer;
 import com.mxt.anitrend.base.custom.presenter.CommonPresenter;
 import com.mxt.anitrend.base.custom.sheet.BottomSheetBase;
 import com.mxt.anitrend.base.custom.viewmodel.ViewModelBase;
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java
index c60d3e65b..42f28eeeb 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/image/AvatarIndicatorView.java
@@ -11,13 +11,11 @@
 import com.mxt.anitrend.base.interfaces.view.CustomView;
 import com.mxt.anitrend.databinding.WidgetAvatarIndicatorBinding;
 import com.mxt.anitrend.model.entity.anilist.User;
-import com.mxt.anitrend.model.entity.base.UserBase;
 import com.mxt.anitrend.presenter.base.BasePresenter;
 import com.mxt.anitrend.presenter.widget.WidgetPresenter;
 import com.mxt.anitrend.util.CompatUtil;
 import com.mxt.anitrend.util.DateUtil;
 import com.mxt.anitrend.util.KeyUtil;
-import com.mxt.anitrend.util.NotifyUtil;
 import com.mxt.anitrend.view.activity.detail.NotificationActivity;
 import com.mxt.anitrend.view.activity.detail.ProfileActivity;
 import com.mxt.anitrend.view.activity.index.LoginActivity;
@@ -64,18 +62,12 @@ public void onInit() {
 
     private void checkLastSyncTime() {
         if(presenter.getApplicationPref().isAuthenticated()) {
-            if ((currentUser = presenter.getDatabase().getCurrentUser()) != null) {
-                if (currentUser.getUnreadNotificationCount() < 1)
-                    hideNotificationCountWidget();
-                else
-                    showNotificationWidget();
-            } else {
+            currentUser = presenter.getDatabase().getCurrentUser();
+            if (currentUser.getUnreadNotificationCount() > 0)
+                showNotificationWidget();
+            else
                 hideNotificationCountWidget();
-            }
-            if (DateUtil.timeDifferenceSatisfied(KeyUtil.TIME_UNIT_MINUTES, mLastSynced, 2))
-                mLastSynced = System.currentTimeMillis();
             AvatarImageView.setImage(binding.userAvatar, currentUser.getAvatar());
-
         }
     }
 
@@ -89,23 +81,24 @@ public void onViewRecycled() {
     public void onModelChanged(BaseConsumer<User> consumer) {
         if(consumer.getRequestMode() == KeyUtil.USER_CURRENT_REQ) {
             presenter.getDatabase().saveCurrentUser(consumer.getChangeModel());
+            if (DateUtil.timeDifferenceSatisfied(KeyUtil.TIME_UNIT_MINUTES, mLastSynced, 15))
+                mLastSynced = System.currentTimeMillis();
             checkLastSyncTime();
         }
     }
 
     private void showNotificationWidget() {
         binding.notificationCount.setText(String.valueOf(currentUser.getUnreadNotificationCount()));
+        binding.notificationCount.setVisibility(VISIBLE);
         binding.container.setVisibility(VISIBLE);
+        invalidate();
     }
 
     private void hideNotificationCountWidget() {
         binding.notificationCount.setText(String.valueOf(currentUser.getUnreadNotificationCount()));
+        binding.notificationCount.setVisibility(GONE);
         binding.container.setVisibility(GONE);
-    }
-
-    private void resetCounter() {
-        currentUser.setUnreadNotificationCount(0);
-        hideNotificationCountWidget();
+        invalidate();
     }
 
     @Override
@@ -113,10 +106,9 @@ public void onClick(View view) {
         if(presenter.getApplicationPref().isAuthenticated()) {
             if (view.getId() == R.id.user_avatar) {
                 Intent intent;
-                if (currentUser.getUnreadNotificationCount() > 0) {
-                    resetCounter();
+                if (currentUser.getUnreadNotificationCount() > 0)
                     intent = new Intent(getContext(), NotificationActivity.class);
-                } else {
+                else {
                     intent = new Intent(getContext(), ProfileActivity.class);
                     intent.putExtra(KeyUtil.arg_userName, currentUser.getName());
                 }
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java
index 7f02cd955..f368e5c8d 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/AiringTextView.java
@@ -2,10 +2,8 @@
 
 import android.content.Context;
 import android.databinding.BindingAdapter;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 
-import com.mxt.anitrend.model.entity.anilist.meta.AiringSchedule;
 import com.mxt.anitrend.model.entity.base.MediaBase;
 import com.mxt.anitrend.util.CompatUtil;
 import com.mxt.anitrend.util.DateUtil;
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RichMarkdownTextView.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RichMarkdownTextView.java
index 4bb6962fa..29942b8c8 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RichMarkdownTextView.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/RichMarkdownTextView.java
@@ -5,7 +5,6 @@
 import android.support.annotation.StringRes;
 import android.support.v4.text.util.LinkifyCompat;
 import android.support.v7.widget.AppCompatTextView;
-import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java
index a4ee955fa..d0ec29d81 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesTitleView.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.util.AttributeSet;
 
-import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.interfaces.view.CustomView;
 import com.mxt.anitrend.model.entity.anilist.MediaList;
 import com.mxt.anitrend.model.entity.anilist.Review;
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesYearTypeTextView.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesYearTypeTextView.java
new file mode 100644
index 000000000..e7581977b
--- /dev/null
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/text/SeriesYearTypeTextView.java
@@ -0,0 +1,63 @@
+package com.mxt.anitrend.base.custom.view.text;
+
+import android.content.Context;
+import android.databinding.BindingAdapter;
+import android.util.AttributeSet;
+
+import com.mxt.anitrend.R;
+import com.mxt.anitrend.model.entity.anilist.meta.FuzzyDate;
+import com.mxt.anitrend.model.entity.base.MediaBase;
+import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.KeyUtil;
+
+import java.util.Locale;
+
+public class SeriesYearTypeTextView extends SingleLineTextView {
+
+    public SeriesYearTypeTextView(Context context) {
+        super(context);
+    }
+
+    public SeriesYearTypeTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public SeriesYearTypeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @Override
+    public void onViewRecycled() {
+        super.onViewRecycled();
+    }
+
+    @Override
+    public void onInit() {
+        super.onInit();
+    }
+
+    @BindingAdapter("media")
+    public static void htmlText(SeriesYearTypeTextView seriesYearTypeTextView, MediaBase mediaBase) {
+        Context context = seriesYearTypeTextView.getContext();
+        FuzzyDate startDate = mediaBase.getStartDate();
+        String year = startDate.isValidDate() ? String.format(Locale.getDefault(), "%d", startDate.getYear()) : context.getString(R.string.tba_placeholder);
+        switch (mediaBase.getType()) {
+            case KeyUtil.ANIME:
+                if(CompatUtil.equals(mediaBase.getFormat(), KeyUtil.MOVIE))
+                    seriesYearTypeTextView.setText(String.format(Locale.getDefault(), "%s - %s", year, CompatUtil.capitalizeWords(mediaBase.getFormat())));
+                else {
+                    if(mediaBase.getEpisodes() > 0)
+                        seriesYearTypeTextView.setText(String.format(Locale.getDefault(), "%s - %s", year, context.getString(R.string.text_anime_episodes, mediaBase.getEpisodes())));
+                    else
+                        seriesYearTypeTextView.setText(String.format(Locale.getDefault(), "%s - %s", year, CompatUtil.capitalizeWords(mediaBase.getFormat())));
+                }
+                break;
+            case KeyUtil.MANGA:
+                if(mediaBase.getChapters() > 0)
+                    seriesYearTypeTextView.setText(String.format(Locale.getDefault(), "%s - %s", year, context.getString(R.string.text_manga_chapters, mediaBase.getChapters())));
+                else
+                    seriesYearTypeTextView.setText(String.format(Locale.getDefault(), "%s - %s", year, CompatUtil.capitalizeWords(mediaBase.getFormat())));
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AboutPanelWidget.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AboutPanelWidget.java
index b05c91620..cfc2be358 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AboutPanelWidget.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/AboutPanelWidget.java
@@ -32,6 +32,7 @@
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.NotifyUtil;
 import com.mxt.anitrend.view.activity.detail.FavouriteActivity;
+import com.mxt.anitrend.view.sheet.BottomSheetListUsers;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -231,28 +232,24 @@ public void onClick(View view) {
                 if(followers == null || followers.getTotal() < 1)
                     NotifyUtil.makeText(getContext(), R.string.text_activity_loading, Toast.LENGTH_SHORT).show();
                 else if (fragmentManager != null){
-                    /*mBottomSheet = new BottomSheetListUsers.Builder()
-                            .setModel(GraphUtil.getDefaultQuery(true)
-                                    .putVariable(KeyUtils.arg_id, userId),
-                                    KeyUtils.USER_FOLLOWERS_REQ)
+                    mBottomSheet = new BottomSheetListUsers.Builder().setUserId(userId)
+                            .setModelCount(followers.getTotal())
+                            .setRequestType(KeyUtil.USER_FOLLOWERS_REQ)
                             .setTitle(R.string.title_bottom_sheet_followers)
                             .build();
-                    mBottomSheet.show(fragmentManager, mBottomSheet.getTag());*/
-                    NotifyUtil.makeText(getContext(), R.string.TBA, Toast.LENGTH_SHORT).show();
+                    mBottomSheet.show(fragmentManager, mBottomSheet.getTag());
                 }
                 break;
             case R.id.user_following_container:
                 if(following == null || following.getTotal() < 1)
                     NotifyUtil.makeText(getContext(), R.string.text_activity_loading, Toast.LENGTH_SHORT).show();
                 else if (fragmentManager != null){
-                    /*mBottomSheet = new BottomSheetListUsers.Builder()
-                            .setModel(GraphUtil.getDefaultQuery(true)
-                                    .putVariable(KeyUtils.arg_id, userId),
-                                    KeyUtils.USER_FOLLOWING_REQ)
+                    mBottomSheet = new BottomSheetListUsers.Builder().setUserId(userId)
+                            .setModelCount(following.getTotal())
+                            .setRequestType(KeyUtil.USER_FOLLOWING_REQ)
                             .setTitle(R.string.title_bottom_sheet_following)
                             .build();
-                    mBottomSheet.show(fragmentManager, mBottomSheet.getTag());*/
-                    NotifyUtil.makeText(getContext(), R.string.TBA, Toast.LENGTH_SHORT).show();
+                    mBottomSheet.show(fragmentManager, mBottomSheet.getTag());
                 }
                 break;
         }
diff --git a/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/StatusDeleteWidget.java b/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/StatusDeleteWidget.java
index e350435c8..ae14e6d07 100644
--- a/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/StatusDeleteWidget.java
+++ b/app/src/main/java/com/mxt/anitrend/base/custom/view/widget/StatusDeleteWidget.java
@@ -24,7 +24,6 @@
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.NotifyUtil;
 
-import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/app/src/main/java/com/mxt/anitrend/base/interfaces/dao/BoxQuery.java b/app/src/main/java/com/mxt/anitrend/base/interfaces/dao/BoxQuery.java
index 63fb7b132..a36a935d7 100644
--- a/app/src/main/java/com/mxt/anitrend/base/interfaces/dao/BoxQuery.java
+++ b/app/src/main/java/com/mxt/anitrend/base/interfaces/dao/BoxQuery.java
@@ -1,7 +1,6 @@
 package com.mxt.anitrend.base.interfaces.dao;
 
 import com.mxt.anitrend.model.entity.anilist.Genre;
-import com.mxt.anitrend.model.entity.anilist.MediaList;
 import com.mxt.anitrend.model.entity.anilist.MediaTag;
 import com.mxt.anitrend.model.entity.anilist.User;
 import com.mxt.anitrend.model.entity.anilist.WebToken;
diff --git a/app/src/main/java/com/mxt/anitrend/data/DatabaseHelper.java b/app/src/main/java/com/mxt/anitrend/data/DatabaseHelper.java
index f3863bc10..8fa329d9b 100644
--- a/app/src/main/java/com/mxt/anitrend/data/DatabaseHelper.java
+++ b/app/src/main/java/com/mxt/anitrend/data/DatabaseHelper.java
@@ -6,12 +6,10 @@
 import com.mxt.anitrend.App;
 import com.mxt.anitrend.base.interfaces.dao.BoxQuery;
 import com.mxt.anitrend.model.entity.anilist.Genre;
-import com.mxt.anitrend.model.entity.anilist.MediaList;
 import com.mxt.anitrend.model.entity.anilist.MediaTag;
 import com.mxt.anitrend.model.entity.anilist.User;
 import com.mxt.anitrend.model.entity.anilist.WebToken;
 import com.mxt.anitrend.model.entity.base.AuthBase;
-import com.mxt.anitrend.model.entity.base.NotificationBase;
 import com.mxt.anitrend.model.entity.base.NotificationHistory;
 import com.mxt.anitrend.model.entity.base.UserBase;
 import com.mxt.anitrend.model.entity.base.VersionBase;
diff --git a/app/src/main/java/com/mxt/anitrend/model/api/converter/GraphQLConverter.java b/app/src/main/java/com/mxt/anitrend/model/api/converter/GraphQLConverter.java
index 6cb74bd1e..510c4fc42 100644
--- a/app/src/main/java/com/mxt/anitrend/model/api/converter/GraphQLConverter.java
+++ b/app/src/main/java/com/mxt/anitrend/model/api/converter/GraphQLConverter.java
@@ -16,7 +16,6 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
-import java.util.List;
 
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
diff --git a/app/src/main/java/com/mxt/anitrend/model/api/retro/base/RepositoryModel.java b/app/src/main/java/com/mxt/anitrend/model/api/retro/base/RepositoryModel.java
index ad72e3eaa..56e73b79d 100644
--- a/app/src/main/java/com/mxt/anitrend/model/api/retro/base/RepositoryModel.java
+++ b/app/src/main/java/com/mxt/anitrend/model/api/retro/base/RepositoryModel.java
@@ -16,8 +16,4 @@ public interface RepositoryModel {
 
     @GET("/wax911/anitrend-resources/{branch}/builds/meta.json")
     Call<VersionBase> checkVersion(@Path("branch") String branch);
-
-    @GET("/wax911/anitrend-resources/master/builds/meta.json")
-    Call<VersionBase> checkVersion();
-
 }
diff --git a/app/src/main/java/com/mxt/anitrend/model/entity/anilist/MediaTag.java b/app/src/main/java/com/mxt/anitrend/model/entity/anilist/MediaTag.java
index 14f8ff523..76dce83d1 100644
--- a/app/src/main/java/com/mxt/anitrend/model/entity/anilist/MediaTag.java
+++ b/app/src/main/java/com/mxt/anitrend/model/entity/anilist/MediaTag.java
@@ -19,6 +19,7 @@ public class MediaTag implements Parcelable {
     private boolean isGeneralSpoiler;
     private boolean isMediaSpoiler;
     private boolean isAdult;
+    private boolean isSelected;
 
     public MediaTag() {
 
@@ -33,6 +34,7 @@ protected MediaTag(Parcel in) {
         isGeneralSpoiler = in.readByte() != 0;
         isMediaSpoiler = in.readByte() != 0;
         isAdult = in.readByte() != 0;
+        isSelected = in.readByte() != 0;
     }
 
     @Override
@@ -45,6 +47,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeByte((byte) (isGeneralSpoiler ? 1 : 0));
         dest.writeByte((byte) (isMediaSpoiler ? 1 : 0));
         dest.writeByte((byte) (isAdult ? 1 : 0));
+        dest.writeByte((byte) (isSelected ? 1 : 0));
     }
 
     @Override
@@ -96,6 +99,10 @@ public boolean isAdult() {
         return isAdult;
     }
 
+    public boolean isSelected() {
+        return isSelected;
+    }
+
     public void setId(long id) {
         this.id = id;
     }
diff --git a/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationBase.java b/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationBase.java
index bc32459c2..d2cc066b7 100644
--- a/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationBase.java
+++ b/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationBase.java
@@ -6,9 +6,6 @@
 import com.mxt.anitrend.model.entity.group.EntityGroup;
 import com.mxt.anitrend.util.KeyUtil;
 
-import io.objectbox.annotation.Entity;
-import io.objectbox.annotation.Id;
-
 /**
  * Created by max on 2018/02/24.
  * Notification base meta data class
diff --git a/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java b/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java
index fe24fee1c..dab9e0a02 100644
--- a/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java
+++ b/app/src/main/java/com/mxt/anitrend/model/entity/base/NotificationHistory.java
@@ -2,37 +2,35 @@
 
 import io.objectbox.annotation.Entity;
 import io.objectbox.annotation.Id;
-import io.objectbox.annotation.Index;
 
 @Entity
 public class NotificationHistory {
 
     @Id(assignable = true)
     private long id;
-    @Index
-    private long lastReadId;
+    private boolean read;
 
     public NotificationHistory() {
 
     }
 
+    public NotificationHistory(long id) {
+        this.id = id;
+    }
+
     public long getId() {
         return id;
     }
 
-    public long getLastReadId() {
-        return lastReadId;
+    public boolean isRead() {
+        return read;
     }
 
     public void setId(long id) {
         this.id = id;
     }
 
-    public void setLastReadId(long lastReadId) {
-        this.lastReadId = lastReadId;
-    }
-
-    public boolean isNew(long id) {
-        return lastReadId >= id;
+    public void setRead(boolean read) {
+        this.read = read;
     }
 }
diff --git a/app/src/main/java/com/mxt/anitrend/model/entity/base/VersionBase.java b/app/src/main/java/com/mxt/anitrend/model/entity/base/VersionBase.java
index 0298bfef5..76794d2b0 100644
--- a/app/src/main/java/com/mxt/anitrend/model/entity/base/VersionBase.java
+++ b/app/src/main/java/com/mxt/anitrend/model/entity/base/VersionBase.java
@@ -104,19 +104,7 @@ public void setCode(long code) {
         this.code = code;
     }
 
-    public void setMigration(boolean migration) {
-        this.migration = migration;
-    }
-
-    public void setReleaseNotes(String releaseNotes) {
-        this.releaseNotes = releaseNotes;
-    }
-
     public void setVersion(String version) {
         this.version = version;
     }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/mxt/anitrend/model/entity/container/request/QueryContainerBuilder.java b/app/src/main/java/com/mxt/anitrend/model/entity/container/request/QueryContainerBuilder.java
index 9a185fb79..6b6b09f6b 100644
--- a/app/src/main/java/com/mxt/anitrend/model/entity/container/request/QueryContainerBuilder.java
+++ b/app/src/main/java/com/mxt/anitrend/model/entity/container/request/QueryContainerBuilder.java
@@ -6,8 +6,6 @@
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
-import com.mxt.anitrend.util.CompatUtil;
-import com.mxt.anitrend.util.KeyUtil;
 
 import java.util.Map;
 
diff --git a/app/src/main/java/com/mxt/anitrend/presenter/base/BasePresenter.java b/app/src/main/java/com/mxt/anitrend/presenter/base/BasePresenter.java
index 43c0b7637..ff8677226 100644
--- a/app/src/main/java/com/mxt/anitrend/presenter/base/BasePresenter.java
+++ b/app/src/main/java/com/mxt/anitrend/presenter/base/BasePresenter.java
@@ -60,7 +60,7 @@ public List<String> getTopFavouriteGenres() {
                     favouriteGenres = Stream.of(userStats.getFavouredGenresOverview())
                             .sortBy(genreStat -> - genreStat.getAmount())
                             .map(GenreStats::getGenre)
-                            .limit(4).toList();
+                            .limit(3).toList();
 
                 }
             }
diff --git a/app/src/main/java/com/mxt/anitrend/service/AuthenticatorService.java b/app/src/main/java/com/mxt/anitrend/service/AuthenticatorService.java
index 6c3f42087..4b16db5a8 100644
--- a/app/src/main/java/com/mxt/anitrend/service/AuthenticatorService.java
+++ b/app/src/main/java/com/mxt/anitrend/service/AuthenticatorService.java
@@ -8,19 +8,12 @@
 
 import com.mxt.anitrend.base.custom.consumer.BaseConsumer;
 import com.mxt.anitrend.base.interfaces.event.RetroCallback;
-import com.mxt.anitrend.model.api.retro.WebFactory;
-import com.mxt.anitrend.model.api.retro.anilist.UserModel;
-import com.mxt.anitrend.model.entity.anilist.MediaList;
 import com.mxt.anitrend.model.entity.anilist.User;
-import com.mxt.anitrend.model.entity.container.body.GraphContainer;
-import com.mxt.anitrend.presenter.base.BasePresenter;
 import com.mxt.anitrend.presenter.widget.WidgetPresenter;
 import com.mxt.anitrend.util.ErrorUtil;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 
-import java.util.List;
-
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/app/src/main/java/com/mxt/anitrend/service/DownloaderService.java b/app/src/main/java/com/mxt/anitrend/service/DownloaderService.java
index d730c9d7d..9efbc0b1c 100644
--- a/app/src/main/java/com/mxt/anitrend/service/DownloaderService.java
+++ b/app/src/main/java/com/mxt/anitrend/service/DownloaderService.java
@@ -22,7 +22,7 @@ public class DownloaderService {
      */
     public static void downloadNewVersion(Context context, VersionBase versionBase) {
         ApplicationPref applicationPref = new ApplicationPref(context);
-        String downloadLink = String.format(RepositoryModel.DOWNLOAD_LINK, applicationPref.getChannel());
+        String downloadLink = String.format(RepositoryModel.DOWNLOAD_LINK, applicationPref.getUpdateChannel());
         DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
         DownloadManager.Request request = new DownloadManager.Request(Uri.parse(downloadLink));
         request.setTitle(String.format(Locale.getDefault(), "AniTrend V%s RC%d.apk", versionBase.getVersion(), versionBase.getCode()));
diff --git a/app/src/main/java/com/mxt/anitrend/util/AnalyticsUtil.java b/app/src/main/java/com/mxt/anitrend/util/AnalyticsUtil.java
index 1c748c86f..71b7a429a 100644
--- a/app/src/main/java/com/mxt/anitrend/util/AnalyticsUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/AnalyticsUtil.java
@@ -21,12 +21,6 @@ public static void logEvent(Context context, @NonNull String key, @NonNull Bundl
             .logEvent(key, params);
     }
 
-    public static void logEvent(ApplicationPref applicationPref, Context context, @NonNull String key, @NonNull String params) {
-        if (applicationPref.isAuthenticated() && context != null)
-            ((App) context.getApplicationContext()).getAnalytics()
-                    .setUserProperty(key, params);
-    }
-
     public static void logCurrentScreen(FragmentActivity fragmentActivity, @NonNull String tag) {
         if(fragmentActivity != null)
             ((App) fragmentActivity.getApplicationContext()).getAnalytics()
diff --git a/app/src/main/java/com/mxt/anitrend/util/ApplicationPref.java b/app/src/main/java/com/mxt/anitrend/util/ApplicationPref.java
index b7a4e3b48..a52cd0183 100644
--- a/app/src/main/java/com/mxt/anitrend/util/ApplicationPref.java
+++ b/app/src/main/java/com/mxt/anitrend/util/ApplicationPref.java
@@ -24,10 +24,11 @@ public class ApplicationPref {
 
     /** Application Base Options */
     private final String _isLightTheme = "_isLightTheme";
-    private final String _channel = "_channel";
+    private final String _updateChannel = "_updateChannel";
 
     /** Api Keys */
     private final String _sortOrder = "_sortOrder";
+    private final String _mediaStatus = "_mediaStatus";
     private final String _mediaFormat = "_mediaFormat";
     private final String _mediaSource = "_mediaSource";
     private final String _airingSort = "_airingSort";
@@ -152,6 +153,17 @@ public void saveSortOrder(@KeyUtil.SortOrderType String sortOrder) {
     }
 
 
+    public @Nullable @KeyUtil.MediaStatus String getMediaStatus() {
+        return sharedPreferences.getString(_mediaStatus, null);
+    }
+
+    public void setMediaStatus(@KeyUtil.MediaStatus String mediaStatus) {
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString(_mediaStatus, mediaStatus);
+        editor.apply();
+    }
+
+
     public @Nullable @KeyUtil.MediaFormat String getMediaFormat() {
         return sharedPreferences.getString(_mediaFormat, null);
     }
@@ -175,7 +187,7 @@ public void setMediaSource(@KeyUtil.MediaSource String mediaSource) {
 
 
     public @KeyUtil.AiringSort String getAiringSort() {
-        return sharedPreferences.getString(_airingSort, KeyUtil.EPISODE) + getSortOrder();
+        return sharedPreferences.getString(_airingSort, KeyUtil.EPISODE);
     }
 
     public void setAiringSort(@KeyUtil.AiringSort String airingSort) {
@@ -186,7 +198,7 @@ public void setAiringSort(@KeyUtil.AiringSort String airingSort) {
 
 
     public @KeyUtil.CharacterSort String getCharacterSort() {
-        return sharedPreferences.getString(_characterSort, KeyUtil.ROLE) + getSortOrder();
+        return sharedPreferences.getString(_characterSort, KeyUtil.ROLE);
     }
 
     public void setCharacterSort(@KeyUtil.CharacterSort String characterSort) {
@@ -197,7 +209,7 @@ public void setCharacterSort(@KeyUtil.CharacterSort String characterSort) {
 
 
     public @KeyUtil.MediaListSort String getMediaListSort() {
-        return sharedPreferences.getString(_mediaListSort, KeyUtil.PROGRESS) + getSortOrder();
+        return sharedPreferences.getString(_mediaListSort, KeyUtil.PROGRESS);
     }
 
     public void setMediaListSort(@KeyUtil.MediaListSort String mediaListSort) {
@@ -208,7 +220,7 @@ public void setMediaListSort(@KeyUtil.MediaListSort String mediaListSort) {
 
 
     public @KeyUtil.MediaSort String getMediaSort() {
-        return sharedPreferences.getString(_mediaSort, KeyUtil.POPULARITY) + getSortOrder();
+        return sharedPreferences.getString(_mediaSort, KeyUtil.POPULARITY);
     }
 
     public void setMediaSort(@KeyUtil.MediaSort String mediaSort) {
@@ -218,7 +230,7 @@ public void setMediaSort(@KeyUtil.MediaSort String mediaSort) {
     }
 
     public @KeyUtil.MediaTrendSort String getMediaTrendSort() {
-        return sharedPreferences.getString(_mediaTrendSort, KeyUtil.TRENDING) + getSortOrder();
+        return sharedPreferences.getString(_mediaTrendSort, KeyUtil.TRENDING);
     }
 
     public void setMediaTrendSort(@KeyUtil.MediaTrendSort String mediaTrendSort) {
@@ -229,7 +241,7 @@ public void setMediaTrendSort(@KeyUtil.MediaTrendSort String mediaTrendSort) {
 
 
     public @KeyUtil.ReviewSort String getReviewSort() {
-        return sharedPreferences.getString(_reviewSort, KeyUtil.ID) + getSortOrder();
+        return sharedPreferences.getString(_reviewSort, KeyUtil.ID);
     }
 
     public void setReviewSort(@KeyUtil.ReviewSort String reviewSort) {
@@ -240,7 +252,7 @@ public void setReviewSort(@KeyUtil.ReviewSort String reviewSort) {
 
 
     public @KeyUtil.StaffSort String getStaffSort() {
-        return sharedPreferences.getString(_staffSort, KeyUtil.ROLE) + getSortOrder();
+        return sharedPreferences.getString(_staffSort, KeyUtil.ROLE);
     }
 
     public void setStaffSort(@KeyUtil.StaffSort String staffSort) {
@@ -249,13 +261,13 @@ public void setStaffSort(@KeyUtil.StaffSort String staffSort) {
         editor.apply();
     }
 
-    public @KeyUtil.Channel String getChannel() {
-        return sharedPreferences.getString(_channel, KeyUtil.STABLE);
+    public @KeyUtil.Channel String getUpdateChannel() {
+        return sharedPreferences.getString(_updateChannel, KeyUtil.STABLE);
     }
 
-    public void setChannel(@KeyUtil.Channel String channel) {
+    public void setUpdateChannel(@KeyUtil.Channel String channel) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(_channel, channel);
+        editor.putString(_updateChannel, channel);
         editor.apply();
     }
 }
diff --git a/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java b/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java
index 482b105da..cd5de50ea 100644
--- a/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/CompatUtil.java
@@ -491,6 +491,16 @@ public static String capitalizeWords(String input) {
         return "";
     }
 
+    /**
+     * Get a list from a given array of strings
+     * @return list of capitalized strings
+     */
+    public static List<String> capitalizeWords(String... strings) {
+        return Stream.of(strings)
+                .map(CompatUtil::capitalizeWords)
+                .toList();
+    }
+
     public static <T extends Collection> boolean isEmpty(@Nullable T collection) {
         return collection == null || collection.isEmpty();
     }
diff --git a/app/src/main/java/com/mxt/anitrend/util/GraphUtil.java b/app/src/main/java/com/mxt/anitrend/util/GraphUtil.java
index 691da9226..5cd175435 100644
--- a/app/src/main/java/com/mxt/anitrend/util/GraphUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/GraphUtil.java
@@ -33,6 +33,6 @@ public static String[] getMultipleParams(String... params) {
      * TODO: 2018/03/25  Add preference keys that should trigger a refresh, such as sorting and ordering
      */
     public static boolean isKeyFilter(String preferenceKey) {
-        return false;
+        return true;
     }
 }
diff --git a/app/src/main/java/com/mxt/anitrend/util/HtmlTagHandler.java b/app/src/main/java/com/mxt/anitrend/util/HtmlTagHandler.java
index a912297b8..d1e6fbbe3 100644
--- a/app/src/main/java/com/mxt/anitrend/util/HtmlTagHandler.java
+++ b/app/src/main/java/com/mxt/anitrend/util/HtmlTagHandler.java
@@ -2,6 +2,7 @@
 
 import android.text.Editable;
 import android.text.Html;
+
 import org.xml.sax.XMLReader;
 
 /**
diff --git a/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java b/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java
index d5f71f429..dc8d1efe2 100644
--- a/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/KeyUtil.java
@@ -250,7 +250,7 @@ public interface KeyUtil {
     // ------------------------------------------------------------------------------------
 
     String ID = "ID", MEDIA_ID = "MEDIA_ID", SCORE = "SCORE", STATUS = "STATUS", SEARCH_MATCH = "SEARCH_MATCH", ROLE = "ROLE", LANGUAGE = "LANGUAGE",
-            DATE = "DATE", POPULARITY = "POPULARITY", TRENDING = "TRENDING", EPISODE = "TRENDING";
+            DATE = "DATE", POPULARITY = "POPULARITY", TRENDING = "TRENDING", EPISODE = "EPISODE";
 
 
     String ASC = "", DESC = "_DESC";
@@ -342,7 +342,7 @@ public interface KeyUtil {
 
 
     String[] MediaSeason = {WINTER, SPRING, SUMMER, FALL};
-    String[] MediaStatus = {FINISHED, RELEASING, NOT_YET_RELEASED, CANCELLED};
+    String[] MediaStatus = {null, FINISHED, RELEASING, NOT_YET_RELEASED, CANCELLED};
     String[] MediaSource = {null, ORIGINAL, MANGA, LIGHT_NOVEL, VISUAL_NOVEL, VIDEO_GAME, OTHER};
     String[] MediaFormat = {null, TV, TV_SHORT, MOVIE, SPECIAL, OVA, ONA, MUSIC, MANGA, NOVEL, ONE_SHOT};
     String[] MediaRankType = {RATED, POPULAR};
@@ -444,10 +444,10 @@ public interface KeyUtil {
 
 
     // ------------------------------------------------------------------------------------
-    // Edge Type Attributes
+    // Update Channels
     // ------------------------------------------------------------------------------------
 
-    String STABLE = "master", BETA = "develop";
+    String STABLE = "", BETA = "develop";
 
     @StringDef({STABLE, BETA})
     @interface Channel {}
diff --git a/app/src/main/java/com/mxt/anitrend/util/MediaActionUtil.java b/app/src/main/java/com/mxt/anitrend/util/MediaActionUtil.java
index 0e7556031..84dc6123d 100644
--- a/app/src/main/java/com/mxt/anitrend/util/MediaActionUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/MediaActionUtil.java
@@ -4,18 +4,13 @@
 import android.arch.lifecycle.Lifecycle;
 import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.interfaces.event.LifecycleListener;
 import com.mxt.anitrend.base.interfaces.event.RetroCallback;
-import com.mxt.anitrend.model.entity.anilist.Media;
-import com.mxt.anitrend.model.entity.anilist.MediaList;
-import com.mxt.anitrend.model.entity.anilist.User;
 import com.mxt.anitrend.model.entity.base.MediaBase;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.widget.WidgetPresenter;
diff --git a/app/src/main/java/com/mxt/anitrend/util/MediaDialogUtil.java b/app/src/main/java/com/mxt/anitrend/util/MediaDialogUtil.java
index bf9212e32..74f8632c0 100644
--- a/app/src/main/java/com/mxt/anitrend/util/MediaDialogUtil.java
+++ b/app/src/main/java/com/mxt/anitrend/util/MediaDialogUtil.java
@@ -3,7 +3,6 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -14,13 +13,11 @@
 import com.mxt.anitrend.base.custom.view.widget.CustomSeriesManageBase;
 import com.mxt.anitrend.base.custom.view.widget.CustomSeriesMangaManage;
 import com.mxt.anitrend.base.interfaces.event.RetroCallback;
-import com.mxt.anitrend.model.entity.anilist.Media;
 import com.mxt.anitrend.model.entity.anilist.MediaList;
 import com.mxt.anitrend.model.entity.anilist.meta.DeleteState;
 import com.mxt.anitrend.model.entity.base.MediaBase;
 import com.mxt.anitrend.presenter.widget.WidgetPresenter;
 
-import okhttp3.ResponseBody;
 import retrofit2.Call;
 import retrofit2.Response;
 
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/base/SettingsActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/base/SettingsActivity.java
index 9c211934a..8b3453268 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/base/SettingsActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/base/SettingsActivity.java
@@ -209,6 +209,7 @@ public void onCreate(Bundle savedInstanceState) {
             // updated to reflect the new value, per the Android Design
             // guidelines.
             bindPreferenceSummaryToValue(findPreference(getString(R.string.pref_key_startup_page)));
+            bindPreferenceSummaryToValue(findPreference(getString(R.string.pref_key_update_channel)));
         }
 
         @Override
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java
index 905dea4a3..495100e6a 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/base/WelcomeActivity.java
@@ -1,88 +1,93 @@
 package com.mxt.anitrend.view.activity.base;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 
+import com.codemybrainsout.onboarder.AhoyOnboarderActivity;
+import com.codemybrainsout.onboarder.AhoyOnboarderCard;
 import com.mxt.anitrend.R;
-import com.mxt.anitrend.base.custom.activity.ActivityBase;
-import com.mxt.anitrend.presenter.base.BasePresenter;
 import com.mxt.anitrend.util.CompatUtil;
 import com.mxt.anitrend.view.activity.index.MainActivity;
-import com.ramotion.paperonboarding.PaperOnboardingFragment;
-import com.ramotion.paperonboarding.PaperOnboardingPage;
-import com.ramotion.paperonboarding.listeners.PaperOnboardingOnRightOutListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by max on 2017/11/09.
  */
 
-public class WelcomeActivity extends ActivityBase<Void, BasePresenter> implements PaperOnboardingOnRightOutListener {
+public class WelcomeActivity extends AhoyOnboarderActivity {
 
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_welcome);
-        setTransparentStatusBar();
-        setViewModel(true);
-        setPresenter(new BasePresenter(this));
-    }
+    private List<AhoyOnboarderCard> ahoyPages;
 
-    @Override
-    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        onActivityReady();
+    private AhoyOnboarderCard applyStyle(AhoyOnboarderCard ahoyOnboarderCard) {
+        ahoyOnboarderCard.setBackgroundColor(R.color.black_transparent);
+        ahoyOnboarderCard.setTitleColor(R.color.grey_200);
+        ahoyOnboarderCard.setDescriptionColor(R.color.grey_300);
+        return ahoyOnboarderCard;
     }
 
-    /**
-     * Make decisions, check for permissions or fire background threads from this method
-     * N.B. Must be called after onPostCreate
-     */
     @Override
-    protected void onActivityReady() {
-        makeRequest();
-    }
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            ahoyPages = new ArrayList<>(CompatUtil.constructListFrom(
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_name),
+                            getString(R.string.app_greeting) + " " + getString(R.string.app_provider),
+                            R.mipmap.ic_launcher)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_colors_title),
+                            getString(R.string.app_intro_colors_text),
+                            R.drawable.ic_format_paint_white_24dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_content_title),
+                            getString(R.string.app_intro_content_text),
+                            R.drawable.ic_bubble_chart_white_24dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_search_title),
+                            getString(R.string.app_intro_search_text),
+                            R.drawable.ic_search_white_24dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_videos_title),
+                            getString(R.string.app_intro_videos_text),
+                            R.drawable.ic_slow_motion_video_white_24dp))
+            ));
+        } else {
+            ahoyPages = new ArrayList<>(CompatUtil.constructListFrom(
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_name),
+                            getString(R.string.app_greeting) + " " + getString(R.string.app_provider),
+                            R.mipmap.ic_launcher)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_colors_title),
+                            getString(R.string.app_intro_colors_text),
+                            R.drawable.ic_format_paint_white_48dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_content_title),
+                            getString(R.string.app_intro_content_text),
+                            R.drawable.ic_bubble_chart_white_48dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_search_title),
+                            getString(R.string.app_intro_search_text),
+                            R.drawable.ic_search_white_48dp)),
+                    applyStyle(new AhoyOnboarderCard(getString(R.string.app_intro_videos_title),
+                            getString(R.string.app_intro_videos_text),
+                            R.drawable.ic_slow_motion_video_white_48dp))
+            ));
+        }
 
-    @Override
-    protected void updateUI() {
-        PaperOnboardingFragment mFragment = PaperOnboardingFragment.newInstance(getIntroductionPages());
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
-        fragmentTransaction.replace(R.id.fragment_container, mFragment, mFragment.getTag());
-        fragmentTransaction.commit();
-        mFragment.setOnRightOutListener(this);
+        setFinishButtonDrawableStyle(ContextCompat.getDrawable(this, R.drawable.finish_button_style));
     }
 
     @Override
-    protected void makeRequest() {
-        updateUI();
-    }
-
-    private ArrayList<PaperOnboardingPage> getIntroductionPages() {
-        return new ArrayList<>(CompatUtil.constructListFrom(
-                new PaperOnboardingPage(getString(R.string.app_greeting), getString(R.string.app_provider),
-                        Color.parseColor("#c26fc1ea"), R.mipmap.ic_launcher, R.drawable.ic_fiber_new_white_24dp),
-                new PaperOnboardingPage(getString(R.string.app_intro_colors_title), getString(R.string.app_intro_colors_text),
-                        Color.parseColor("#c248c76d"), R.drawable.ic_format_paint_white_24dp, R.drawable.ic_format_paint_white_24dp),
-                new PaperOnboardingPage(getString(R.string.app_intro_content_title), getString(R.string.app_intro_content_text),
-                        Color.parseColor("#c2f7464a"), R.drawable.ic_bubble_chart_white_24dp, R.drawable.ic_bubble_chart_white_24dp),
-                new PaperOnboardingPage(getString(R.string.app_intro_search_title), getString(R.string.app_intro_search_text),
-                        Color.parseColor("#c29256f3"), R.drawable.ic_search_white_24dp, R.drawable.ic_search_white_24dp),
-                new PaperOnboardingPage(getString(R.string.app_intro_videos_title), getString(R.string.app_intro_videos_text),
-                        Color.parseColor("#c2fba640"), R.drawable.ic_slow_motion_video_white_24dp, R.drawable.ic_slow_motion_video_white_24dp)
-        ));
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        setFinishButtonTitle(R.string.get_started);
+        showNavigationControls(true);
+        setGradientBackground();
+        setOnboardPages(ahoyPages);
     }
 
     @Override
-    public void onRightOut() {
-        CompatUtil.startRevealAnim(this, getWindow().getDecorView(), new Intent(WelcomeActivity.this, MainActivity.class), true);
+    public void onFinishButtonPressed() {
+        View target = findViewById(com.codemybrainsout.onboarder.R.id.btn_skip);
+        CompatUtil.startRevealAnim(this, target, new Intent(WelcomeActivity.this, MainActivity.class), true);
     }
 
     @Override
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/detail/CharacterActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/detail/CharacterActivity.java
index 8d15e205a..cfba918f1 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/detail/CharacterActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/detail/CharacterActivity.java
@@ -65,6 +65,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
         if(isAuth) {
             MenuItem favouriteMenuItem = menu.findItem(R.id.action_favourite);
             favouriteWidget = (FavouriteToolbarWidget) favouriteMenuItem.getActionView();
+            if(model != null)
+                favouriteWidget.setModel(model);
         }
         return true;
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java
index 33f3d21bf..ca4fc9278 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/detail/MediaActivity.java
@@ -81,10 +81,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.media_base_menu, menu);
         menu.findItem(R.id.action_favourite).setVisible(isAuth);
         menu.findItem(R.id.action_manage).setVisible(isAuth);
+        menu.findItem(R.id.action_share).setVisible(false);
 
         if(isAuth) {
             MenuItem favouriteMenuItem = menu.findItem(R.id.action_favourite);
             favouriteWidget = (FavouriteToolbarWidget) favouriteMenuItem.getActionView();
+            if(model != null)
+                favouriteWidget.setModel(model);
         }
         return super.onCreateOptionsMenu(menu);
     }
@@ -98,6 +101,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                             .setId(model.getId()).build(this);
                     mediaActionUtil.startSeriesAction();
                     break;
+                case R.id.action_share_compact:
+                    break;
+                case R.id.action_share_full:
+                    break;
             }
         } else
             NotifyUtil.makeText(getApplicationContext(), R.string.text_activity_loading, Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/detail/NotificationActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/detail/NotificationActivity.java
index b9436ba2e..b937a997e 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/detail/NotificationActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/detail/NotificationActivity.java
@@ -8,12 +8,9 @@
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.base.custom.activity.ActivityBase;
-import com.mxt.anitrend.model.entity.anilist.Notification;
 import com.mxt.anitrend.presenter.base.BasePresenter;
 import com.mxt.anitrend.view.fragment.detail.NotificationFragment;
 
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/detail/ProfileActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/detail/ProfileActivity.java
index 98fed7024..932fdb56b 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/detail/ProfileActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/detail/ProfileActivity.java
@@ -6,7 +6,6 @@
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/detail/StaffActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/detail/StaffActivity.java
index e19c3f031..dbf8a8360 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/detail/StaffActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/detail/StaffActivity.java
@@ -64,6 +64,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
         if(isAuth) {
             MenuItem favouriteMenuItem = menu.findItem(R.id.action_favourite);
             favouriteWidget = (FavouriteToolbarWidget) favouriteMenuItem.getActionView();
+            if(model != null)
+                favouriteWidget.setModel(model);
         }
         return true;
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/index/LoginActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/index/LoginActivity.java
index a1b7711bd..cfd6267bd 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/index/LoginActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/index/LoginActivity.java
@@ -21,7 +21,6 @@
 import com.mxt.anitrend.model.entity.base.MessageBase;
 import com.mxt.anitrend.presenter.activity.LoginPresenter;
 import com.mxt.anitrend.presenter.widget.WidgetPresenter;
-import com.mxt.anitrend.service.AuthenticatorService;
 import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.JobSchedulerUtil;
diff --git a/app/src/main/java/com/mxt/anitrend/view/activity/index/SplashActivity.java b/app/src/main/java/com/mxt/anitrend/view/activity/index/SplashActivity.java
index 3d968ea55..02088ffb1 100644
--- a/app/src/main/java/com/mxt/anitrend/view/activity/index/SplashActivity.java
+++ b/app/src/main/java/com/mxt/anitrend/view/activity/index/SplashActivity.java
@@ -67,8 +67,10 @@ protected void updateUI() {
     protected void makeRequest() {
         VersionBase versionBase = getPresenter().getDatabase().getRemoteVersion();
         // How frequent should the application check for updates on startup
-        if(versionBase == null || DateUtil.timeDifferenceSatisfied(KeyUtil.TIME_UNIT_HOURS, versionBase.getLastChecked(), 8))
+        if(versionBase == null || DateUtil.timeDifferenceSatisfied(KeyUtil.TIME_UNIT_HOURS, versionBase.getLastChecked(), 4)) {
+            getViewModel().getParams().putString(KeyUtil.arg_branch_name, getPresenter().getApplicationPref().getUpdateChannel());
             getViewModel().requestData(KeyUtil.UPDATE_CHECKER_REQ, getApplicationContext());
+        }
         else
             updateUI();
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/BrowseReviewFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/BrowseReviewFragment.java
index 643344202..d9440375a 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/BrowseReviewFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/BrowseReviewFragment.java
@@ -3,9 +3,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.index.ReviewAdapter;
 import com.mxt.anitrend.base.custom.fragment.FragmentBaseList;
@@ -14,7 +18,9 @@
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.base.BasePresenter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.MediaActionUtil;
@@ -27,7 +33,6 @@
 /**
  * Created by max on 2017/10/30.
  * Media review browse
- * // TODO: 2018/03/23 Add review sorting
  */
 
 public class BrowseReviewFragment extends FragmentBaseList<Review, PageContainer<Review>, BasePresenter> {
@@ -53,13 +58,47 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if(getArguments() != null)
             mediaType = getArguments().getString(KeyUtil.arg_mediaType);
-        isPager = true; mColumnSize = R.integer.single_list_x1;
+        isPager = true; mColumnSize = R.integer.single_list_x1; isFilterable = true;
         setPresenter(new BasePresenter(getContext()));
         setViewModel(true);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_tag).setVisible(false);
+        menu.findItem(R.id.action_type).setVisible(false);
+        menu.findItem(R.id.action_year).setVisible(false);
+        menu.findItem(R.id.action_status).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.ReviewSortType,
+                            getPresenter().getApplicationPref().getReviewSort()), CompatUtil.capitalizeWords(KeyUtil.ReviewSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setReviewSort(KeyUtil.ReviewSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
-     * Is automatically called in the @onStart Method if overriden in list implementation
+     * Is automatically called in the @onStart Method if overridden in list implementation
      */
     @Override
     protected void updateUI() {
@@ -73,9 +112,12 @@ protected void updateUI() {
      */
     @Override
     public void makeRequest() {
+        ApplicationPref pref = getPresenter().getApplicationPref();
         QueryContainerBuilder queryContainer = GraphUtil.getDefaultQuery(true)
+                .putVariable(KeyUtil.arg_mediaType, mediaType)
                 .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
-                .putVariable(KeyUtil.arg_mediaType, mediaType);
+                .putVariable(KeyUtil.arg_sort, pref.getReviewSort() + pref.getSortOrder());
+
         getViewModel().getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.MEDIA_REVIEWS_REQ, getContext());
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java
index 793ac9425..3bd1fee9f 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MediaStatsFragment.java
@@ -6,7 +6,6 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.graphics.ColorUtils;
 import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,7 +20,6 @@
 import com.github.mikephil.charting.data.PieDataSet;
 import com.github.mikephil.charting.data.PieEntry;
 import com.github.mikephil.charting.formatter.PercentFormatter;
-import com.github.mikephil.charting.highlight.Highlight;
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.detail.LinkAdapter;
 import com.mxt.anitrend.adapter.recycler.detail.RankAdapter;
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java
index d1a08d0fb..9ddc12f29 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/MessageFeedFragment.java
@@ -7,7 +7,6 @@
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.index.FeedAdapter;
-import com.mxt.anitrend.base.custom.consumer.BaseConsumer;
 import com.mxt.anitrend.model.entity.anilist.FeedList;
 import com.mxt.anitrend.util.CompatUtil;
 import com.mxt.anitrend.util.GraphUtil;
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java
index dcd62fb7f..aa228f4ef 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/NotificationFragment.java
@@ -9,13 +9,14 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.annimon.stream.IntPair;
-import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.detail.NotificationAdapter;
+import com.mxt.anitrend.base.custom.async.ThreadPool;
 import com.mxt.anitrend.base.custom.fragment.FragmentBaseList;
+import com.mxt.anitrend.data.DatabaseHelper;
 import com.mxt.anitrend.model.entity.anilist.Notification;
+import com.mxt.anitrend.model.entity.anilist.User;
 import com.mxt.anitrend.model.entity.base.NotificationHistory;
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
@@ -32,6 +33,7 @@
 import com.mxt.anitrend.view.activity.detail.ProfileActivity;
 
 import java.util.Collections;
+import java.util.List;
 
 /**
  * Created by max on 2017/12/06.
@@ -70,6 +72,10 @@ protected void updateUI() {
             mAdapter = new NotificationAdapter(model, getContext());
         injectAdapter();
 
+        User currentUser = getPresenter().getDatabase().getCurrentUser();
+        currentUser.setUnreadNotificationCount(0);
+        getPresenter().getDatabase().saveCurrentUser(currentUser);
+
         //Testing notifications by forcing the notification dispatcher
         /*for (int i = 0; i < 3; i++)
             NotificationDispatcher.createNotification(getContext(), new ArrayList<>(model.subList(i, i + 1)));*/
@@ -87,8 +93,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_mark_all:
                 if(model != null) {
-                    markAllNotificationsAsRead();
-                    mAdapter.notifyDataSetChanged();
+                    ThreadPool.Builder.create().execute(this::markAllNotificationsAsRead);
                 } else
                     NotifyUtil.makeText(getContext(), R.string.text_activity_loading, Toast.LENGTH_SHORT);
                 return true;
@@ -125,27 +130,11 @@ public void onChanged(@Nullable PageContainer<Notification> content) {
     public void makeRequest() {
         QueryContainerBuilder queryContainer = GraphUtil.getDefaultQuery(isPager)
                 .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
-                .putVariable(KeyUtil.arg_resetNotificationCount, false);
+                .putVariable(KeyUtil.arg_resetNotificationCount, true);
         getViewModel().getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.USER_NOTIFICATION_REQ, getContext());
     }
 
-    private void setReadItems(Notification data) {
-        Optional<IntPair<Notification>> pairOptional = CompatUtil.findIndexOf(model, data);
-        if(pairOptional.isPresent()) {
-            NotificationHistory notificationHistory = new NotificationHistory();
-            notificationHistory.setId(getPresenter().getDatabase().getCurrentUser().getId());
-            notificationHistory.setLastReadId(data.getId());
-
-            getPresenter().getDatabase().getBoxStore(NotificationHistory.class)
-                    .put(notificationHistory);
-
-            int pairIndex = pairOptional.get().getFirst();
-            mAdapter.onItemChanged(data, pairIndex);
-        }
-
-    }
-
     /**
      * When the target view from {@link View.OnClickListener}
      * is clicked from a view holder this method will be called
@@ -156,10 +145,10 @@ private void setReadItems(Notification data) {
     @Override
     public void onItemClick(View target, Notification data) {
         Intent intent;
-        setReadItems(data);
+        ThreadPool.Builder.create().execute(() -> setItemAsRead(data));
         if(target.getId() == R.id.notification_img && !CompatUtil.equals(data.getType(), KeyUtil.AIRING)) {
             intent = new Intent(getActivity(), ProfileActivity.class);
-            intent.putExtra(KeyUtil.arg_userName, data.getUser().getName());
+            intent.putExtra(KeyUtil.arg_id, data.getUser().getId());
             CompatUtil.startRevealAnim(getActivity(), target, intent);
         }
         else
@@ -194,6 +183,11 @@ public void onItemClick(View target, Notification data) {
                     intent.putExtra(KeyUtil.arg_id, data.getActivity().getId());
                     CompatUtil.startRevealAnim(getActivity(), target, intent);
                     break;
+                case KeyUtil.ACTIVITY_REPLY:
+                    intent = new Intent(getActivity(), CommentActivity.class);
+                    intent.putExtra(KeyUtil.arg_id, data.getActivity().getId());
+                    CompatUtil.startRevealAnim(getActivity(), target, intent);
+                    break;
                 case KeyUtil.ACTIVITY_REPLY_LIKE:
                     intent = new Intent(getActivity(), CommentActivity.class);
                     intent.putExtra(KeyUtil.arg_id, data.getActivity().getId());
@@ -219,7 +213,7 @@ public void onItemClick(View target, Notification data) {
     @Override
     public void onItemLongClick(View target, Notification data) {
         if(CompatUtil.equals(data.getType(), KeyUtil.AIRING)) {
-            setReadItems(data);
+            ThreadPool.Builder.create().execute(() -> setItemAsRead(data));
             if(getPresenter().getApplicationPref().isAuthenticated()) {
                 mediaActionUtil = new MediaActionUtil.Builder()
                         .setId(data.getMedia().getId()).build(getActivity());
@@ -229,15 +223,33 @@ public void onItemLongClick(View target, Notification data) {
         }
     }
 
+    /**
+     * Ran on a background thread to assure we don't skip frames
+     * @see ThreadPool
+     */
+    private void setItemAsRead(Notification data) {
+        getPresenter().getDatabase().getBoxStore(NotificationHistory.class)
+                .put(new NotificationHistory(data.getId()));
+    }
+
+    /**
+     * Ran on a background thread to assure we don't skip frames
+     * @see ThreadPool
+     */
     private void markAllNotificationsAsRead() {
-        Optional<Notification> notificationOptional = Stream.of(model).findFirst();
-        if(notificationOptional.isPresent()) {
-            NotificationHistory notificationHistory = new NotificationHistory();
-            notificationHistory.setId(getPresenter().getDatabase().getCurrentUser().getId());
-            notificationHistory.setLastReadId(notificationOptional.get().getId());
-
-            getPresenter().getDatabase().getBoxStore(NotificationHistory.class)
-                    .put(notificationHistory);
-        }
+        DatabaseHelper databaseHelper = getPresenter().getDatabase();
+
+        List<NotificationHistory> notificationHistories = Stream.of(model)
+                .map(notification -> new NotificationHistory(notification.getId()))
+                .toList();
+
+        databaseHelper.getBoxStore(NotificationHistory.class)
+                .put(notificationHistories);
+
+        if (getActivity() != null)
+            getActivity().runOnUiThread(() -> {
+                if(mAdapter != null)
+                    mAdapter.notifyDataSetChanged();
+            });
     }
 }
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/StudioMediaFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/StudioMediaFragment.java
index 2e20420f8..b42f1cc88 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/StudioMediaFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/StudioMediaFragment.java
@@ -3,9 +3,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.index.MediaAdapter;
 import com.mxt.anitrend.base.custom.fragment.FragmentBaseList;
@@ -14,7 +18,9 @@
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.fragment.MediaPresenter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.MediaActionUtil;
@@ -44,10 +50,45 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         if(getArguments() != null)
             id = getArguments().getLong(KeyUtil.arg_id);
         mColumnSize = R.integer.grid_giphy_x3; isPager = true;
+        isFilterable = true;
         setPresenter(new MediaPresenter(getContext()));
         setViewModel(true);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_tag).setVisible(false);
+        menu.findItem(R.id.action_type).setVisible(false);
+        menu.findItem(R.id.action_year).setVisible(false);
+        menu.findItem(R.id.action_status).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if(getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.MediaSortType,
+                            getPresenter().getApplicationPref().getMediaSort()), CompatUtil.capitalizeWords(KeyUtil.MediaSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaSort(KeyUtil.MediaSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void updateUI() {
         if(mAdapter == null)
@@ -58,9 +99,11 @@ protected void updateUI() {
 
     @Override
     public void makeRequest() {
+        ApplicationPref pref = getPresenter().getApplicationPref();
         QueryContainerBuilder queryContainer = GraphUtil.getDefaultQuery(isPager)
                 .putVariable(KeyUtil.arg_id, id)
-                .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage());
+                .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
+                .putVariable(KeyUtil.arg_sort, pref.getMediaSort() + pref.getSortOrder());
         getViewModel().getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.STUDIO_MEDIA_REQ, getContext());
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/UserFeedFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/UserFeedFragment.java
index a8c142b90..f13574cf5 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/detail/UserFeedFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/detail/UserFeedFragment.java
@@ -3,15 +3,10 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 
-import com.mxt.anitrend.base.interfaces.event.PublisherListener;
-import com.mxt.anitrend.model.entity.base.UserBase;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.view.fragment.list.FeedListFragment;
 
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 /**
  * Created by max on 2017/11/26.
  * user profile targeted feeds
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaStaffRoleFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaStaffRoleFragment.java
index 0fac6081c..ad8c7fe06 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaStaffRoleFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/group/MediaStaffRoleFragment.java
@@ -8,7 +8,6 @@
 
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.group.GroupSeriesAdapter;
-import com.mxt.anitrend.adapter.recycler.group.GroupStaffRoleAdapter;
 import com.mxt.anitrend.base.custom.fragment.FragmentBaseList;
 import com.mxt.anitrend.model.entity.anilist.edge.MediaEdge;
 import com.mxt.anitrend.model.entity.base.MediaBase;
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/list/AiringListFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/list/AiringListFragment.java
index 555b4c25d..cf5500093 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/list/AiringListFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/list/AiringListFragment.java
@@ -3,9 +3,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.annimon.stream.IntPair;
 import com.annimon.stream.Optional;
 import com.mxt.anitrend.R;
@@ -16,7 +20,9 @@
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.base.BasePresenter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.MediaActionUtil;
@@ -49,10 +55,44 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setPresenter(new BasePresenter(getContext()));
         isPager = true; mColumnSize = R.integer.grid_list_x2;
-        hasSubscriber = true;
+        hasSubscriber = true; isFilterable = true;
         setViewModel(true);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_tag).setVisible(false);
+        menu.findItem(R.id.action_type).setVisible(false);
+        menu.findItem(R.id.action_year).setVisible(false);
+        menu.findItem(R.id.action_status).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.MediaListSortType,
+                            getPresenter().getApplicationPref().getMediaListSort()), CompatUtil.capitalizeWords(KeyUtil.MediaListSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaListSort(KeyUtil.MediaListSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
      * Is automatically called in the @onStart Method if overriden in list implementation
      */
@@ -68,11 +108,16 @@ protected void updateUI() {
      */
     @Override
     public void makeRequest() {
+       ApplicationPref pref = getPresenter().getApplicationPref();
+
         QueryContainerBuilder queryContainer = GraphUtil.getDefaultQuery(isPager)
                 .putVariable(KeyUtil.arg_type, KeyUtil.ANIME)
                 .putVariable(KeyUtil.arg_status, KeyUtil.CURRENT)
+                .putVariable(KeyUtil.arg_sort, pref.getMediaListSort() + pref.getSortOrder())
+                .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
                 .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
                 .putVariable(KeyUtil.arg_userName, getPresenter().getDatabase().getCurrentUser().getName());
+
         getViewModel().getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.MEDIA_LIST_BROWSE_REQ, getContext());
     }
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java
index 020bd52b4..a8747bcd2 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaBrowseFragment.java
@@ -3,17 +3,26 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.mxt.anitrend.R;
 import com.mxt.anitrend.adapter.recycler.index.MediaAdapter;
 import com.mxt.anitrend.base.custom.fragment.FragmentBaseList;
+import com.mxt.anitrend.model.entity.anilist.Genre;
+import com.mxt.anitrend.model.entity.anilist.MediaTag;
 import com.mxt.anitrend.model.entity.base.MediaBase;
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.fragment.MediaPresenter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DateUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.MediaActionUtil;
 import com.mxt.anitrend.util.MediaBrowseUtil;
@@ -21,6 +30,7 @@
 import com.mxt.anitrend.view.activity.detail.MediaActivity;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -69,6 +79,77 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setViewModel(true);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_tag).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.MediaSortType,
+                            getPresenter().getApplicationPref().getMediaSort()), CompatUtil.capitalizeWords(KeyUtil.MediaSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaSort(KeyUtil.MediaSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_genre:
+                    List<Genre> genres = getPresenter().getDatabase().getGenreCollection();
+                    if(CompatUtil.isEmpty(genres)) {
+                        NotifyUtil.makeText(getContext(), R.string.app_splash_loading, R.drawable.ic_warning_white_18dp, Toast.LENGTH_SHORT).show();
+                        getPresenter().checkGenresAndTags(getActivity());
+                    }
+                    // pending implementation :
+                    // https://github.com/AniTrend/anitrend-app/blob/aac381ad369d372bf03688c9fc8e6bb27c78c323/app/src/main/java/com/mxt/anitrend/base/custom/fragment/FragmentBase.java
+                    return true;
+                case R.id.action_tag:
+                    List<MediaTag> tagList = getPresenter().getDatabase().getMediaTags();
+                    if(CompatUtil.isEmpty(tagList)) {
+                        NotifyUtil.makeText(getContext(), R.string.app_splash_loading, R.drawable.ic_warning_white_18dp, Toast.LENGTH_SHORT).show();
+                        getPresenter().checkGenresAndTags(getActivity());
+                    }
+                    return true;
+                case R.id.action_type:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_show_type, CompatUtil.getIndexOf(KeyUtil.MediaFormat,
+                            getPresenter().getApplicationPref().getMediaFormat()), CompatUtil.getStringList(getContext(), R.array.media_formats),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaFormat(KeyUtil.MediaFormat[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_year:
+                    final List<Integer> yearRanges = DateUtil.getYearRanges(1980, 1);
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_year, CompatUtil.getIndexOf(yearRanges, getPresenter().getApplicationPref().getSeasonYear()),
+                            yearRanges, (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSeasonYear(yearRanges.get(dialog.getSelectedIndex()));
+                            });
+                    return true;
+                case R.id.action_status:
+                    DialogUtil.createSelection(getContext(), R.string.anime, CompatUtil.getIndexOf(KeyUtil.MediaStatus,
+                            getPresenter().getApplicationPref().getMediaStatus()), CompatUtil.getStringList(getContext(), R.array.media_status),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaStatus(KeyUtil.MediaStatus[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void updateUI() {
         if(mAdapter == null)
@@ -79,6 +160,7 @@ protected void updateUI() {
     @Override
     public void makeRequest() {
         Bundle bundle = getViewModel().getParams();
+        ApplicationPref pref = getPresenter().getApplicationPref();
         queryContainer.putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
                 .putVariable(KeyUtil.arg_sort, getPresenter().getApplicationPref().getMediaSort());
 
@@ -88,6 +170,10 @@ public void makeRequest() {
                         "%d%%", getPresenter().getApplicationPref().getSeasonYear()));
             else
                 queryContainer.putVariable(KeyUtil.arg_seasonYear, getPresenter().getApplicationPref().getSeasonYear());
+
+            queryContainer.putVariable(KeyUtil.arg_sort, pref.getMediaSort() + pref.getSortOrder())
+                    .putVariable(KeyUtil.arg_status, pref.getMediaStatus())
+                    .putVariable(KeyUtil.arg_format, pref.getMediaFormat());
         }
 
         bundle.putParcelable(KeyUtil.arg_graph_params, queryContainer);
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaListFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaListFragment.java
index d65d2fadc..99d6e3481 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaListFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/list/MediaListFragment.java
@@ -1,17 +1,17 @@
 package com.mxt.anitrend.view.fragment.list;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.annimon.stream.IntPair;
 import com.annimon.stream.Optional;
 import com.mxt.anitrend.R;
@@ -23,7 +23,9 @@
 import com.mxt.anitrend.model.entity.container.body.PageContainer;
 import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
 import com.mxt.anitrend.presenter.fragment.MediaPresenter;
+import com.mxt.anitrend.util.ApplicationPref;
 import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.KeyUtil;
 import com.mxt.anitrend.util.MediaActionUtil;
 import com.mxt.anitrend.util.NotifyUtil;
@@ -74,6 +76,40 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         setViewModel(true);
     }
 
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_tag).setVisible(false);
+        menu.findItem(R.id.action_type).setVisible(false);
+        menu.findItem(R.id.action_year).setVisible(false);
+        menu.findItem(R.id.action_status).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.MediaListSortType,
+                            getPresenter().getApplicationPref().getMediaListSort()), CompatUtil.capitalizeWords(KeyUtil.MediaListSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaListSort(KeyUtil.MediaListSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
+    }
+
     /**
      * Is automatically called in the @onStart Method if overridden in list implementation
      */
@@ -92,41 +128,21 @@ protected void updateUI() {
      */
     @Override
     public void makeRequest() {
+        ApplicationPref pref = getPresenter().getApplicationPref();
+
         if (userId != 0)
             queryContainer.putVariable(KeyUtil.arg_userId, userId);
         else
             queryContainer.putVariable(KeyUtil.arg_userName, userName);
 
         queryContainer.putVariable(KeyUtil.arg_mediaType, mediaType)
-                .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage());
+                .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage())
+                .putVariable(KeyUtil.arg_sort, pref.getMediaListSort() + pref.getSortOrder());
 
         getViewModel().getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.MEDIA_LIST_BROWSE_REQ, getContext());
     }
 
-    /**
-     * Initialize the contents of the Fragment host's standard options menu.  You
-     * should place your menu items in to <var>menu</var>.  For this method
-     * to be called, you must have first called {@link #setHasOptionsMenu}.  See
-     * {@link Activity#onCreateOptionsMenu(Menu) Activity.onCreateOptionsMenu}
-     * for more information.
-     *
-     * @param menu     The options menu in which you place your items.
-     * @param inflater menu inflater
-     * @see #setHasOptionsMenu
-     * @see #onPrepareOptionsMenu
-     * @see #onOptionsItemSelected
-     */
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        menu.findItem(R.id.action_share).setVisible(false);
-        menu.findItem(R.id.action_genre).setVisible(false);
-        menu.findItem(R.id.action_type).setVisible(false);
-        menu.findItem(R.id.action_year).setVisible(false);
-        menu.findItem(R.id.action_status).setVisible(false);
-    }
-
     /**
      * When the target view from {@link View.OnClickListener}
      * is clicked from a view holder this method will be called
diff --git a/app/src/main/java/com/mxt/anitrend/view/fragment/list/SuggestionListFragment.java b/app/src/main/java/com/mxt/anitrend/view/fragment/list/SuggestionListFragment.java
index 78c2059b5..1ba0f6a8b 100644
--- a/app/src/main/java/com/mxt/anitrend/view/fragment/list/SuggestionListFragment.java
+++ b/app/src/main/java/com/mxt/anitrend/view/fragment/list/SuggestionListFragment.java
@@ -3,11 +3,15 @@
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 
+import com.afollestad.materialdialogs.DialogAction;
 import com.mxt.anitrend.R;
+import com.mxt.anitrend.util.ApplicationPref;
+import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.DialogUtil;
 import com.mxt.anitrend.util.GraphUtil;
 import com.mxt.anitrend.util.KeyUtil;
-import com.mxt.anitrend.util.MediaBrowseUtil;
 
 /**
  * Created by max on 2017/11/04.
@@ -28,8 +32,10 @@ public static SuggestionListFragment newInstance(Bundle params) {
 
     @Override
     public void makeRequest() {
+        ApplicationPref pref = getPresenter().getApplicationPref();
         Bundle bundle = getViewModel().getParams();
         queryContainer.putVariable(KeyUtil.arg_genres, getPresenter().getTopFavouriteGenres())
+                .putVariable(KeyUtil.arg_sort, pref.getMediaSort() + pref.getSortOrder())
                 .putVariable(KeyUtil.arg_page, getPresenter().getCurrentPage());
         bundle.putParcelable(KeyUtil.arg_graph_params, queryContainer);
         getViewModel().requestData(KeyUtil.MEDIA_BROWSE_REQ, getContext());
@@ -39,5 +45,32 @@ public void makeRequest() {
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         menu.findItem(R.id.action_genre).setVisible(false);
+        menu.findItem(R.id.action_type).setVisible(false);
+        menu.findItem(R.id.action_year).setVisible(false);
+        menu.findItem(R.id.action_status).setVisible(false);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (getContext() != null)
+            switch (item.getItemId()) {
+                case R.id.action_sort:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_sort, CompatUtil.getIndexOf(KeyUtil.MediaSortType,
+                            getPresenter().getApplicationPref().getMediaSort()), CompatUtil.capitalizeWords(KeyUtil.MediaSortType),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().setMediaSort(KeyUtil.MediaSortType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+                case R.id.action_order:
+                    DialogUtil.createSelection(getContext(), R.string.app_filter_order, CompatUtil.getIndexOf(KeyUtil.SortOrderType,
+                            getPresenter().getApplicationPref().getSortOrder()), CompatUtil.getStringList(getContext(), R.array.order_by_types),
+                            (dialog, which) -> {
+                                if(which == DialogAction.POSITIVE)
+                                    getPresenter().getApplicationPref().saveSortOrder(KeyUtil.SortOrderType[dialog.getSelectedIndex()]);
+                            });
+                    return true;
+            }
+        return super.onOptionsItemSelected(item);
     }
 }
diff --git a/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java b/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java
new file mode 100644
index 000000000..a6d033b83
--- /dev/null
+++ b/app/src/main/java/com/mxt/anitrend/view/sheet/BottomSheetListUsers.java
@@ -0,0 +1,326 @@
+package com.mxt.anitrend.view.sheet;
+
+import android.app.Dialog;
+import android.arch.lifecycle.Observer;
+import android.arch.lifecycle.ViewModelProviders;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.view.View;
+
+import com.mxt.anitrend.R;
+import com.mxt.anitrend.adapter.recycler.index.UserAdapter;
+import com.mxt.anitrend.base.custom.recycler.RecyclerViewAdapter;
+import com.mxt.anitrend.base.custom.recycler.StatefulRecyclerView;
+import com.mxt.anitrend.base.custom.sheet.BottomSheetBase;
+import com.mxt.anitrend.base.custom.view.container.CustomSwipeRefreshLayout;
+import com.mxt.anitrend.base.custom.viewmodel.ViewModelBase;
+import com.mxt.anitrend.base.interfaces.event.ItemClickListener;
+import com.mxt.anitrend.base.interfaces.event.RecyclerLoadListener;
+import com.mxt.anitrend.databinding.BottomSheetListBinding;
+import com.mxt.anitrend.model.entity.base.UserBase;
+import com.mxt.anitrend.model.entity.container.body.PageContainer;
+import com.mxt.anitrend.model.entity.container.request.QueryContainerBuilder;
+import com.mxt.anitrend.presenter.base.BasePresenter;
+import com.mxt.anitrend.util.CompatUtil;
+import com.mxt.anitrend.util.GraphUtil;
+import com.mxt.anitrend.util.KeyUtil;
+import com.mxt.anitrend.view.activity.detail.ProfileActivity;
+import com.nguyenhoanglam.progresslayout.ProgressLayout;
+
+import java.util.Collections;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class BottomSheetListUsers extends BottomSheetBase<PageContainer<UserBase>> implements ItemClickListener<UserBase>, Observer<PageContainer<UserBase>>,
+        RecyclerLoadListener, CustomSwipeRefreshLayout.OnRefreshAndLoadListener {
+
+
+    protected List<UserBase> model;
+
+    protected @BindView(R.id.stateLayout)
+    ProgressLayout stateLayout;
+    protected @BindView(R.id.recyclerView)
+    StatefulRecyclerView recyclerView;
+
+    protected RecyclerViewAdapter<UserBase> mAdapter;
+    protected StaggeredGridLayoutManager mLayoutManager;
+
+    protected int mColumnSize;
+    protected boolean isPager, isLimit;
+
+    private int count;
+    private long userId;
+    private @KeyUtil.RequestType int requestType;
+
+    private final View.OnClickListener stateLayoutOnClick = view -> {
+        stateLayout.showLoading();
+        onRefresh();
+    };
+
+    private BottomSheetListBinding binding;
+
+    public static BottomSheetListUsers newInstance(Bundle bundle) {
+        BottomSheetListUsers fragment = new BottomSheetListUsers();
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if(getArguments() != null) {
+            count = getArguments().getInt(KeyUtil.arg_model);
+            userId = getArguments().getLong(KeyUtil.arg_userId);
+            requestType = getArguments().getInt(KeyUtil.arg_request_type);
+        }
+        setViewModel(true); isPager = true;
+        presenter = new BasePresenter(getContext());
+        mColumnSize = getResources().getInteger(R.integer.single_list_x1);
+    }
+
+    /**
+     * Setup your view un-binder here as well as inflating other views as needed
+     * into your view stub
+     *
+     * @param savedInstanceState
+     */
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        binding = BottomSheetListBinding.inflate(CompatUtil.getLayoutInflater(getActivity()));
+        dialog.setContentView(binding.getRoot());
+        unbinder = ButterKnife.bind(this, dialog);
+        createBottomSheetBehavior(binding.getRoot());
+        mLayoutManager = new StaggeredGridLayoutManager(mColumnSize, StaggeredGridLayoutManager.VERTICAL);
+        return dialog;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        toolbarTitle.setText(getString(mTitle, count));
+        searchView.setVisibility(View.GONE);
+        stateLayout.showLoading();
+        if(CompatUtil.isEmpty(model))
+            onRefresh();
+        else
+            updateUI();
+    }
+
+    protected void addScrollLoadTrigger() {
+        if(isPager)
+            if (!recyclerView.hasOnScrollListener()) {
+                presenter.initListener(mLayoutManager, this);
+                recyclerView.addOnScrollListener(presenter);
+            }
+    }
+
+    protected void removeScrollLoadTrigger() {
+        if (isPager)
+            recyclerView.clearOnScrollListeners();
+    }
+
+    @Override
+    public void onPause() {
+        removeScrollLoadTrigger();
+        super.onPause();
+    }
+
+    @Override
+    public void onResume() {
+        addScrollLoadTrigger();
+        super.onResume();
+    }
+
+    /**
+     * Set your adapter and call this method when you are done to the current
+     * parents data, then call this method after
+     */
+    protected void injectAdapter() {
+        mAdapter.setClickListener(this);
+        if (recyclerView.getAdapter() == null) {
+            recyclerView.setHasFixedSize(true);
+            recyclerView.setNestedScrollingEnabled(true);
+            recyclerView.setLayoutManager(mLayoutManager);
+            recyclerView.setAdapter(mAdapter);
+        }
+        else
+            mAdapter.onItemsInserted(model);
+        if (mAdapter.getItemCount() < 1)
+            stateLayout.showEmpty(CompatUtil.getDrawable(getContext(),  R.drawable.ic_new_releases_white_24dp, R.color.colorStateBlue), getString(R.string.layout_empty_response));
+        else
+            stateLayout.showContent();
+    }
+
+    /**
+     * Is automatically called in the @onStart Method if overridden in list implementation
+     */
+    private void updateUI() {
+        if(mAdapter == null)
+            mAdapter = new UserAdapter(model, getContext());
+        injectAdapter();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void setViewModel(boolean stateSupported) {
+        if(viewModel == null) {
+            viewModel = ViewModelProviders.of(this).get(ViewModelBase.class);
+            viewModel.setContext(getContext());
+            if(!viewModel.getModel().hasActiveObservers())
+                viewModel.getModel().observe(this, this);
+            if(stateSupported)
+                viewModel.setState(this);
+        }
+    }
+
+    /**
+     * While paginating if our request was a success and
+     */
+    public void setLimitReached() {
+        if(presenter != null && presenter.getCurrentPage() != 0)
+            isLimit = true;
+    }
+
+    @Override
+    public void onRefresh() {
+        model = null;
+        if(mAdapter != null)
+            mAdapter.clearItems();
+        if (isPager && presenter != null)
+            presenter.onRefreshPage();
+        makeRequest();
+    }
+
+    @Override
+    public void onLoad() {
+
+    }
+
+    @Override
+    public void onLoadMore() {
+        makeRequest();
+    }
+
+    /**
+     * All new or updated network requests should be handled in this method
+     */
+    public void makeRequest() {
+        QueryContainerBuilder queryContainer = GraphUtil.getDefaultQuery(isPager)
+                .putVariable(KeyUtil.arg_id, userId)
+                .putVariable(KeyUtil.arg_page, presenter.getCurrentPage());
+
+        viewModel.getParams().putParcelable(KeyUtil.arg_graph_params, queryContainer);
+        viewModel.requestData(requestType, getContext());
+    }
+
+    /**
+     * Handles post view model result after extraction or processing
+     * @param content The main data model for the class
+     */
+    protected void onPostProcessed(@Nullable List<UserBase> content) {
+        if(content != null) {
+            if(content.size() > 0) {
+                if(isPager) {
+                    if (model == null) model = content;
+                    else model.addAll(content);
+                }
+                else
+                    model = content;
+                updateUI();
+            } else {
+                if (isPager || (presenter.getPageInfo() != null && !presenter.getPageInfo().hasNextPage()))
+                    setLimitReached();
+                if (model == null || model.size() < 1)
+                    showEmpty(getString(R.string.layout_empty_response));
+            }
+        } else
+            showEmpty(getString(R.string.layout_empty_response));
+    }
+
+    /**
+     * Called when the data is changed.
+     *
+     * @param content The new data
+     */
+    @Override
+    public void onChanged(@Nullable PageContainer<UserBase> content) {
+        if(content != null) {
+            if(content.hasPageInfo())
+                presenter.setPageInfo(content.getPageInfo());
+            if(!content.isEmpty())
+                onPostProcessed(content.getPageData());
+            else
+                onPostProcessed(Collections.emptyList());
+        } else
+            onPostProcessed(Collections.emptyList());
+        if(model == null)
+            onPostProcessed(null);
+    }
+
+    @Override
+    public void showError(String error) {
+        super.showError(error);
+        stateLayout.showLoading();
+        stateLayout.showError(CompatUtil.getDrawable(getContext(), R.drawable.ic_warning_white_18dp, R.color.colorStateOrange),
+                error, getString(R.string.try_again), stateLayoutOnClick);
+    }
+
+    @Override
+    public void showEmpty(String message) {
+        super.showEmpty(message);
+        stateLayout.showLoading();
+        stateLayout.showError(CompatUtil.getDrawable(getContext(),  R.drawable.ic_warning_white_18dp, R.color.colorStateBlue),
+                message, getString(R.string.try_again) , stateLayoutOnClick);
+    }
+
+    @Override
+    public void onItemClick(View target, UserBase data) {
+        switch (target.getId()) {
+            case R.id.container:
+                Intent intent = new Intent(getActivity(), ProfileActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.putExtra(KeyUtil.arg_id, data.getId());
+                CompatUtil.startRevealAnim(getActivity(), target, intent);
+                break;
+        }
+    }
+
+    @Override
+    public void onItemLongClick(View target, UserBase data) {
+
+    }
+
+
+
+    /**
+     * Builder class for bottom sheet
+     */
+    public static class Builder extends BottomSheetBuilder {
+
+        @Override
+        public BottomSheetBase build() {
+            return newInstance(bundle);
+        }
+
+        public Builder setUserId(long userId) {
+            bundle.putLong(KeyUtil.arg_userId, userId);
+            return this;
+        }
+
+        public Builder setModelCount(int count) {
+            bundle.putInt(KeyUtil.arg_model, count);
+            return this;
+        }
+
+        public BottomSheetBuilder setRequestType(@KeyUtil.RequestType int requestType) {
+            bundle.putInt(KeyUtil.arg_request_type, requestType);
+            return this;
+        }
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/ic_bubble_chart_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_bubble_chart_white_48dp.png
new file mode 100644
index 000000000..921c6e6f6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_bubble_chart_white_48dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_format_paint_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_format_paint_white_48dp.png
new file mode 100644
index 000000000..ff089af0f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_format_paint_white_48dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_search_white_48dp.png
new file mode 100644
index 000000000..722ff8195
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search_white_48dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_slow_motion_video_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_slow_motion_video_white_48dp.png
new file mode 100644
index 000000000..b3da0246e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_slow_motion_video_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_bubble_chart_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_bubble_chart_white_48dp.png
new file mode 100644
index 000000000..5ec571724
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_bubble_chart_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_format_paint_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_format_paint_white_48dp.png
new file mode 100644
index 000000000..0709d3403
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_format_paint_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_search_white_48dp.png
new file mode 100644
index 000000000..f9d04518b
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_slow_motion_video_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_slow_motion_video_white_48dp.png
new file mode 100644
index 000000000..c57ed082f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_slow_motion_video_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bubble_chart_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_bubble_chart_white_48dp.png
new file mode 100644
index 000000000..fdec1f3a5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_bubble_chart_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_format_paint_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_format_paint_white_48dp.png
new file mode 100644
index 000000000..1d39ee789
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_format_paint_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_search_white_48dp.png
new file mode 100644
index 000000000..47cc04fbe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_slow_motion_video_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_slow_motion_video_white_48dp.png
new file mode 100644
index 000000000..81997f888
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_slow_motion_video_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bubble_chart_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_bubble_chart_white_48dp.png
new file mode 100644
index 000000000..b39115e10
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_bubble_chart_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_format_paint_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_format_paint_white_48dp.png
new file mode 100644
index 000000000..59a93d7b8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_format_paint_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
new file mode 100644
index 000000000..d7ae5e17b
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_slow_motion_video_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_slow_motion_video_white_48dp.png
new file mode 100644
index 000000000..a77ccefdd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_slow_motion_video_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bubble_chart_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bubble_chart_white_48dp.png
new file mode 100644
index 000000000..92b53a0a9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_bubble_chart_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_format_paint_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_format_paint_white_48dp.png
new file mode 100644
index 000000000..b09fbb215
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_format_paint_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png
new file mode 100644
index 000000000..7ed0115db
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_slow_motion_video_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_slow_motion_video_white_48dp.png
new file mode 100644
index 000000000..8fd8efcb7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_slow_motion_video_white_48dp.png differ
diff --git a/app/src/main/res/drawable/ic_genre_grey_600_24dp.xml b/app/src/main/res/drawable/ic_genre_grey_600_24dp.xml
index 38484d5e8..0eded6490 100644
--- a/app/src/main/res/drawable/ic_genre_grey_600_24dp.xml
+++ b/app/src/main/res/drawable/ic_genre_grey_600_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#757575" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2L4,2c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7zM17.27,15.27L13,19.54l-4.27,-4.27C8.28,14.81 8,14.19 8,13.5c0,-1.38 1.12,-2.5 2.5,-2.5 0.69,0 1.32,0.28 1.77,0.74l0.73,0.72 0.73,-0.73c0.45,-0.45 1.08,-0.73 1.77,-0.73 1.38,0 2.5,1.12 2.5,2.5 0,0.69 -0.28,1.32 -0.73,1.77z"/>
+    <path android:fillColor="#757575" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16zM16,17H5V7h11l3.55,5L16,17z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tag_grey_600_24dp.xml b/app/src/main/res/drawable/ic_tag_grey_600_24dp.xml
new file mode 100644
index 000000000..38484d5e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tag_grey_600_24dp.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#757575" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2L4,2c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7zM17.27,15.27L13,19.54l-4.27,-4.27C8.28,14.81 8,14.19 8,13.5c0,-1.38 1.12,-2.5 2.5,-2.5 0.69,0 1.32,0.28 1.77,0.74l0.73,0.72 0.73,-0.73c0.45,-0.45 1.08,-0.73 1.77,-0.73 1.38,0 2.5,1.12 2.5,2.5 0,0.69 -0.28,1.32 -0.73,1.77z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
deleted file mode 100644
index 07b97e7aa..000000000
--- a/app/src/main/res/layout/activity_welcome.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.activity.base.WelcomeActivity">
-
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_anime.xml b/app/src/main/res/layout/adapter_anime.xml
index a9b7a66e5..953295f3d 100644
--- a/app/src/main/res/layout/adapter_anime.xml
+++ b/app/src/main/res/layout/adapter_anime.xml
@@ -5,8 +5,6 @@
 
     <data>
         <variable name="model" type="com.mxt.anitrend.model.entity.base.MediaBase" />
-        <import type="com.mxt.anitrend.util.CompatUtil" />
-        <import type="com.mxt.anitrend.util.MediaUtil" />
     </data>
 
     <android.support.v7.widget.CardView
@@ -72,15 +70,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/md_margin" />
 
-                <com.mxt.anitrend.base.custom.view.text.SingleLineFontTextView
+                <com.mxt.anitrend.base.custom.view.text.SeriesYearTypeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/md_margin"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:text="@{CompatUtil.capitalizeWords(model.format)}"
-                    android:textColor="@color/white"
-                    android:background="?colorAccent"
-                    tools:text="TV" />
+                    app:media="@{model}"
+                    tools:text="2015 - TV" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/adapter_manga.xml b/app/src/main/res/layout/adapter_manga.xml
index 7171cde9e..dfcfcfe90 100644
--- a/app/src/main/res/layout/adapter_manga.xml
+++ b/app/src/main/res/layout/adapter_manga.xml
@@ -4,9 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-        <import type="com.mxt.anitrend.util.DateUtil" />
-        <import type="com.mxt.anitrend.util.CompatUtil" />
-        <import type="com.mxt.anitrend.util.MediaUtil" />
         <variable name="model" type="com.mxt.anitrend.model.entity.base.MediaBase" />
     </data>
 
@@ -61,15 +58,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/md_margin" />
 
-                <com.mxt.anitrend.base.custom.view.text.SingleLineFontTextView
+                <com.mxt.anitrend.base.custom.view.text.SeriesYearTypeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/md_margin"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:text="@{CompatUtil.capitalizeWords(model.format)}"
-                    android:textColor="@color/white"
-                    android:background="?colorAccent"
-                    tools:text="Novel" />
+                    app:media="@{model}"
+                    tools:text="2015 - Novel" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/adapter_series.xml b/app/src/main/res/layout/adapter_series.xml
index 8477f9e52..7f2f00db2 100644
--- a/app/src/main/res/layout/adapter_series.xml
+++ b/app/src/main/res/layout/adapter_series.xml
@@ -5,8 +5,6 @@
 
     <data>
         <variable name="model" type="com.mxt.anitrend.model.entity.base.MediaBase" />
-        <import type="com.mxt.anitrend.util.CompatUtil" />
-        <import type="com.mxt.anitrend.util.MediaUtil" />
     </data>
 
     <android.support.v7.widget.CardView
@@ -60,15 +58,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/md_margin" />
 
-                <com.mxt.anitrend.base.custom.view.text.SingleLineFontTextView
+                <com.mxt.anitrend.base.custom.view.text.SeriesYearTypeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/md_margin"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:text="@{CompatUtil.capitalizeWords(model.format)}"
-                    android:textColor="@color/white"
-                    android:background="?colorAccent"
-                    tools:text="TV" />
+                    app:media="@{model}"
+                    tools:text="2015 - TV" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/adapter_series_airing.xml b/app/src/main/res/layout/adapter_series_airing.xml
index b2954dc5b..74803cd9f 100644
--- a/app/src/main/res/layout/adapter_series_airing.xml
+++ b/app/src/main/res/layout/adapter_series_airing.xml
@@ -5,7 +5,6 @@
 
     <data>
         <variable name="model" type="com.mxt.anitrend.model.entity.anilist.MediaList" />
-        <import type="com.mxt.anitrend.util.CompatUtil" />
     </data>
 
     <android.support.v7.widget.CardView
@@ -85,15 +84,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/md_margin" />
 
-                <com.mxt.anitrend.base.custom.view.text.SingleLineFontTextView
+                <com.mxt.anitrend.base.custom.view.text.SeriesYearTypeTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:padding="@dimen/md_margin"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-                    android:text="@{CompatUtil.capitalizeWords(model.media.format)}"
-                    android:textColor="@color/white"
-                    android:background="?colorAccent"
-                    tools:text="OVA" />
+                    app:media="@{model.media}"
+                    tools:text="2015 - TV" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/menu/shared_menu.xml b/app/src/main/res/menu/shared_menu.xml
index e529a8168..48eeb1c07 100644
--- a/app/src/main/res/menu/shared_menu.xml
+++ b/app/src/main/res/menu/shared_menu.xml
@@ -37,6 +37,12 @@
                 android:title="@string/menu_title_genres"
                 app:showAsAction="ifRoom" />
 
+            <item
+                android:id="@+id/action_tag"
+                android:icon="@drawable/ic_tag_grey_600_24dp"
+                android:title="@string/menu_title_tags"
+                app:showAsAction="ifRoom" />
+
             <item
                 android:id="@+id/action_type"
                 android:icon="@drawable/ic_type_grey_600_24dp"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 30394b5e8..ee39201dd 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -184,30 +184,12 @@
         ]]>
     </string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>العنوان</item>
-        <item>التقييم</item>
-        <item>الشعبية</item>
-        <item>بدأ العرض</item>
-        <item>انتهاء العرض</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>تصاعدي</item>
         <item>تنازلي</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>كل القوائم</item>
-        <item>المنتهية</item>
-        <item>المستمرة</item>
-        <item>القادمة</item>
-        <item>الملغية</item>
-    </string-array>
-
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
         <![CDATA[
@@ -367,6 +349,20 @@
         <item>8</item>
     </string-array>
 
+    <!-- Settings for update channel to use -->
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
 
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">الإشعارات</string>
@@ -822,6 +818,14 @@
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -836,16 +840,6 @@
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -939,9 +933,12 @@
     <string name="text_unable_to_load_next_page">Error loading more results!</string>
     <string name="menu_title_mark_all_as_read">Mark All As Read</string>
     <string name="title_score_distribution">Score Distribution</string>
+
     <string name="title_score">Score</string>
     <string name="title_watching">Watching</string>
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b51650732..8a30c7229 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -182,30 +182,12 @@
         ]]>
     </string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>Title</item>
-        <item>Score</item>
-        <item>Popularity</item>
-        <item>Start Date</item>
-        <item>End Date</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>Ascending</item>
         <item>Descending</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>All Listings</item>
-        <item>Ended</item>
-        <item>Ongoing</item>
-        <item>Upcoming</item>
-        <item>Cancelled</item>
-    </string-array>
-
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
         <![CDATA[
@@ -365,6 +347,20 @@
         <item>8</item>
     </string-array>
 
+    <!-- Settings for update channel to use -->
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
 
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Benachrichtigungen</string>
@@ -820,6 +816,14 @@
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -834,16 +838,6 @@
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -937,9 +931,12 @@
     <string name="text_unable_to_load_next_page">Error loading more results!</string>
     <string name="menu_title_mark_all_as_read">Mark All As Read</string>
     <string name="title_score_distribution">Score Distribution</string>
+
     <string name="title_score">Score</string>
     <string name="title_watching">Watching</string>
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8a7c17715..fbb682f67 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -181,30 +181,12 @@
         ]]>
 	</string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>Title</item>
-        <item>Score</item>
-        <item>Popularity</item>
-        <item>Start Date</item>
-        <item>End Date</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>Ascending</item>
         <item>Descending</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>All Listings</item>
-        <item>Ended</item>
-        <item>Ongoing</item>
-        <item>Upcoming</item>
-        <item>Cancelled</item>
-    </string-array>
-
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
 		<![CDATA[
@@ -365,6 +347,20 @@ elementos de tus favoritos al presionar en el icono del corazón .
         <item>8</item>
     </string-array>
 
+    <!-- Settings for update channel to use -->
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
 
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Notificaciones</string>
@@ -819,6 +815,14 @@ elementos de tus favoritos al presionar en el icono del corazón .
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -833,16 +837,6 @@ elementos de tus favoritos al presionar en el icono del corazón .
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -936,9 +930,12 @@ elementos de tus favoritos al presionar en el icono del corazón .
     <string name="text_unable_to_load_next_page">Error loading more results!</string>
     <string name="menu_title_mark_all_as_read">Mark All As Read</string>
     <string name="title_score_distribution">Score Distribution</string>
+
     <string name="title_score">Score</string>
     <string name="title_watching">Watching</string>
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e138cdd83..866041eac 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -183,30 +183,12 @@
         ]]>
     </string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>Title</item>
-        <item>Score</item>
-        <item>Popularity</item>
-        <item>Start Date</item>
-        <item>End Date</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>Ascending</item>
         <item>Descending</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>All Listings</item>
-        <item>Ended</item>
-        <item>Ongoing</item>
-        <item>Upcoming</item>
-        <item>Cancelled</item>
-    </string-array>
-
 
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
@@ -282,13 +264,13 @@
     <string name="tip_messages_title">Messages</string>
     <string name="tip_messages_text">Affiche tout les messages qui vous ont été envoyés et ceux que vous avez envoyés. \n\nAppuyez ici pour Fermer</string>
     <string name="tip_status_post_title">Créer une publication</string>
-    <string name="tip_status_post_text">Publiez un messageBase que tout le monde peut voir ! \n\nAppuyez ici pour Fermer</string>
+    <string name="tip_status_post_text">Publiez un message que tout le monde peut voir ! \n\nAppuyez ici pour Fermer</string>
     <string name="tip_notifications_title">Notifications</string>
     <string name="tip_notifications_text">Accédez à toutes les notifications au même endroit. \n\nAppuyez ici pour Fermer</string>
     <string name="tip_more_actions_title">Plus de Fonctionnalités</string>
     <string name="tip_more_actions_text">Appuyez ici pour plus d\'options comme afficher les "j\'aime". \n\nAppuyez ici pour Fermer</string>
     <string name="tip_compose_message_title">Composer un Message</string>
-    <string name="tip_compose_message_text">Envoyer un messageBase à cet utilisateur. \n\nAppuyez ici pour Fermer</string>
+    <string name="tip_compose_message_text">Envoyer un message à cet utilisateur. \n\nAppuyez ici pour Fermer</string>
 
     <!--Media attachments on the reply activity-->
     <string name="attach_media">Ajouter un Media</string>
@@ -366,11 +348,26 @@
         <item>8</item>
     </string-array>
 
+    <!-- Settings for update channel to use -->
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
+
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Notifications</string>
     <string name="pref_header_notifications_summary">Configurer comment les notifications sont gérer</string>
 
-    <string name="pref_title_new_message_notifications">nouveau messageBase de notification</string>
+    <string name="pref_title_new_message_notifications">nouveau message de notification</string>
     <string name="pref_key_new_message_notifications">notifications_new_message</string>
 
     <string name="pref_title_ringtone">Sonnerie de Notification</string>
@@ -451,7 +448,7 @@
     </string>
 
     <string name="title_view_likes">Voir les "J\'aime"</string>
-    <string name="input_empty_warning">Il n\'est pas possible d\'envoyer un messageBase vide !</string>
+    <string name="input_empty_warning">Il n\'est pas possible d\'envoyer un message vide !</string>
     <string name="completed_success">Action complétée avec succès</string>
 
     <string name="drawer_update_title">Mettre à Jour AniTrend ?</string>
@@ -649,7 +646,7 @@
     <string name="text_anime_length">%d Minutes</string>
     <string name="text_anime_score">%d%% Mean</string>
 
-    <string name="text_message_to">Envoyer un messageBase à %s</string>
+    <string name="text_message_to">Envoyer un message à %s</string>
     <string name="title_bottom_sheet_favourites">Favoris de l\'Utilisateur</string>
     <string name="warning_anime_is_airing">Anime encore en diffusion !</string>
     <string name="warning_anime_not_airing">Anime pas encore diffusé !</string>
@@ -825,6 +822,14 @@
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -839,16 +844,6 @@
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -942,9 +937,12 @@
     <string name="text_unable_to_load_next_page">Error loading more results!</string>
     <string name="menu_title_mark_all_as_read">Mark All As Read</string>
     <string name="title_score_distribution">Score Distribution</string>
+
     <string name="title_score">Score</string>
     <string name="title_watching">Watching</string>
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 35f075a96..2ea014a1a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -183,30 +183,12 @@
         ]]>
     </string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>Title</item>
-        <item>Score</item>
-        <item>Popularity</item>
-        <item>Start Date</item>
-        <item>End Date</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>Ascending</item>
         <item>Descending</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>All Listings</item>
-        <item>Ended</item>
-        <item>Ongoing</item>
-        <item>Upcoming</item>
-        <item>Cancelled</item>
-    </string-array>
-
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
         <![CDATA[
@@ -364,6 +346,21 @@
         <item>8</item>
     </string-array>
 
+    <!-- Settings for update channel to use -->
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
+
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Notifiche</string>
     <string name="pref_header_notifications_summary">Configura come le notifiche sono trasmesse</string>
@@ -818,6 +815,14 @@
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -832,16 +837,6 @@
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -935,9 +930,12 @@
     <string name="text_unable_to_load_next_page">Error loading more results!</string>
     <string name="menu_title_mark_all_as_read">Mark All As Read</string>
     <string name="title_score_distribution">Score Distribution</string>
+
     <string name="title_score">Score</string>
     <string name="title_watching">Watching</string>
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2514b8715..3ac040013 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -191,30 +191,12 @@
         ]]>
     </string>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_sort_types">
-        <item>Title</item>
-        <item>Score</item>
-        <item>Popularity</item>
-        <item>Start Date</item>
-        <item>End Date</item>
-    </string-array>
-
     <!--Do not Translate, native anilist strings-->
     <string-array name="order_by_types">
         <item>Ascending</item>
         <item>Descending</item>
     </string-array>
 
-    <!--Do not Translate, native anilist strings-->
-    <string-array name="series_status_types">
-        <item>All Listings</item>
-        <item>Ended</item>
-        <item>Ongoing</item>
-        <item>Upcoming</item>
-        <item>Cancelled</item>
-    </string-array>
-
     <!--You can translate this just try to keep the meaning consistent :)-->
     <string name="campaign_link">
         <![CDATA[
@@ -291,13 +273,13 @@
     <string name="tip_messages_title">Messages</string>
     <string name="tip_messages_text">View all your messages sent to you and the ones you sent. \n\nTap Here To Dismiss</string>
     <string name="tip_status_post_title">Create Status Post</string>
-    <string name="tip_status_post_text">Post a status messageBase for everyone to see. \n\nTap Here To Dismiss</string>
+    <string name="tip_status_post_text">Post a status message for everyone to see. \n\nTap Here To Dismiss</string>
     <string name="tip_notifications_title">Notifications</string>
     <string name="tip_notifications_text">Access all the notifications from one place. \n\nTap Here To Dismiss</string>
     <string name="tip_more_actions_title">More Actions</string>
     <string name="tip_more_actions_text">Tap here for more options such as viewing likes. \n\nTap Here To Dismiss</string>
     <string name="tip_compose_message_title">Compose Message</string>
-    <string name="tip_compose_message_text">Send a messageBase to this current user. \n\nTap Here To Dismiss</string>
+    <string name="tip_compose_message_text">Send a message to this current user. \n\nTap Here To Dismiss</string>
 
     <!--Media attachments on the reply activity-->
     <string name="attach_media">Insert Media</string>
@@ -383,15 +365,29 @@
         <item>8</item>
     </string-array>
 
+    <string name="pref_title_update_channel">Update Channel</string>
+
+    <string-array name="pref_titles_channel_entries">
+        <item>Stable</item>
+        <item>Beta (Experimental)</item>
+    </string-array>
+
+    <!-- Do Not Translate This -->
+    <string-array name="pref_values_channel_entries">
+        <item>master</item>
+        <item>develop</item>
+    </string-array>
+
     <!--Do not translate anything that is starts with pref_key-->
     <string name="pref_key_startup_page" translatable="false">general_startup_page</string>
+    <string name="pref_key_update_channel" translatable="false">_updateChannel</string>
 
 
     <!-- Settings for Notifications -->
     <string name="pref_header_notifications">Notifications</string>
     <string name="pref_header_notifications_summary">Configure how notifications are handled</string>
 
-    <string name="pref_title_new_message_notifications">New messageBase notifications</string>
+    <string name="pref_title_new_message_notifications">New message notifications</string>
     <string name="pref_key_new_message_notifications">notifications_new_message</string>
 
     <string name="pref_title_ringtone">Notification Ringtone</string>
@@ -669,7 +665,7 @@
     <string name="text_anime_length">%d Minutes</string>
     <string name="text_anime_score">%d%% Mean</string>
 
-    <string name="text_message_to">Send a messageBase to %s</string>
+    <string name="text_message_to">Send a message to %s</string>
     <string name="title_bottom_sheet_favourites">User Favourites</string>
     <string name="warning_anime_is_airing">Anime is still airing!</string>
     <string name="warning_anime_not_airing">Anime hasn\'t aired yet!</string>
@@ -848,6 +844,14 @@
     <string name="anime_time_days">%.1f Days</string>
     <string name="anime_time_years">%.1f Years</string>
 
+    <string-array name="media_status">
+        <item>All</item>
+        <item>Finished</item>
+        <item>Releasing</item>
+        <item>Not Yet Released</item>
+        <item>Canceled</item>
+    </string-array>
+
     <string-array name="media_formats">
         <item>All</item>
         <item>TV</item>
@@ -862,16 +866,6 @@
         <item>One Shot</item>
     </string-array>
 
-    <string-array name="media_sources">
-        <item>All</item>
-        <item>Original</item>
-        <item>Manga</item>
-        <item>Light Novel</item>
-        <item>Visual Novel</item>
-        <item>Video Game</item>
-        <item>Other</item>
-    </string-array>
-
     <string-array name="reviews_title">
         <item>@string/anime</item>
         <item>@string/manga</item>
@@ -971,4 +965,6 @@
     <string name="title_series_stats">Series Stats</string>
     <string name="error_unresolved_type">Unable to resolve content</string>
 
+    <string name="menu_title_tags">Tags</string>
+    <string name="app_filter_tags">Series Tags?</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index b1986a1db..0f176efdc 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -9,4 +9,11 @@
         android:key="@string/pref_key_startup_page"
         android:title="@string/pref_title_startup_page" />
 
+    <ListPreference
+        android:defaultValue="master"
+        android:entries="@array/pref_titles_channel_entries"
+        android:entryValues="@array/pref_values_channel_entries"
+        android:key="@string/pref_key_update_channel"
+        android:title="@string/pref_title_update_channel" />
+
 </PreferenceScreen>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 39bf9e19d..6beb9e368 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         'compileSdk'    : 27,
         'targetSdk'     : 27,
         'minSdk'        : 17,
-        'versionCode'   : 75,
+        'versionCode'   : 76,
         'versionName'   : '1.0.7',
         'buildTools'    : '27.0.3',
         'butterKnife'   : '8.8.1',