diff --git a/.all-contributorsrc b/.all-contributorsrc
index aa7840b9..cd865d08 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -32,6 +32,24 @@
         "question"
       ]
     },
+    {
+      "login": "zerrium",
+      "name": "Zerrium",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58355441?v=4",
+      "profile": "https://github.com/zerrium",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "junhuicoding",
+      "name": "Chua Jun Hui",
+      "avatar_url": "https://avatars.githubusercontent.com/u/54289027?v=4",
+      "profile": "https://github.com/junhuicoding",
+      "contributions": [
+        "code"
+      ]
+    },
     {
       "login": "andersonvom",
       "name": "Anderson Mesquita",
@@ -42,6 +60,16 @@
         "bug"
       ]
     },
+    {
+      "login": "vojta-horanek",
+      "name": "Vojtěch Hořánek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12630566?v=4",
+      "profile": "https://vojtechh.eu/",
+      "contributions": [
+        "code",
+        "translation"
+      ]
+    },
     {
       "login": "MeLlamoPablo",
       "name": "Pablo Rodríguez",
@@ -255,15 +283,15 @@
         "translation"
       ]
     },
-     {
-       "login": "Pyrobauve",
-       "name": "Pyrobauve",
-       "avatar_url": "https://avatars.githubusercontent.com/u/48654473?v=4",
-       "profile": "https://github.com/Pyrobauve",
-       "contributions": [
-         "translation"
-       ]
-     },
+    {
+      "login": "Pyrobauve",
+      "name": "Pyrobauve",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48654473?v=4",
+      "profile": "https://github.com/Pyrobauve",
+      "contributions": [
+        "translation"
+      ]
+    },
     {
       "login": "RAMAR-RAR",
       "name": "RAMAR-RAR",
diff --git a/.codebeatsettings b/.codebeatsettings
new file mode 100644
index 00000000..32a4ee3d
--- /dev/null
+++ b/.codebeatsettings
@@ -0,0 +1,5 @@
+{
+  "JAVA": {
+    "TOO_MANY_IVARS": [8, 10, 20, 30]
+  }
+}
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130c..fb7f4a8a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 23a89bbb..9bba60da 100755
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,6 @@
         <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6e6363fe..89148552 100755
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -40,7 +40,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460d..e497da99 100755
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/.project b/.project
index 800b8ec3..b3746935 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>InstaGrabber</name>
+	<name>Barinsta</name>
 	<comment>Project instagrabber created by Buildship.</comment>
 	<projects>
 	</projects>
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1600117114918</id>
+			<id>0</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
diff --git a/README.md b/README.md
index 16258554..d1301419 100755
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](http://makeapullrequest.com)
 [![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](./LICENSE)
 [![GitHub stars](https://img.shields.io/github/stars/austinhuang0131/instagrabber.svg?style=social&label=Star)](https://GitHub.com/austinhuang0131/barinsta/stargazers/)<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-39-orange.svg)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-42-orange.svg)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Instagram client; previously known as InstaGrabber.
@@ -56,52 +56,55 @@ Prominent contributors are listed here in the [all-contributors](https://allcont
   <tr>
     <td align="center"><a href="https://austinhuang.me"><img src="https://avatars1.githubusercontent.com/u/16656689?s=100" width="100px;" alt=""/><br /><sub><b>Austin Huang</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=austinhuang0131" title="Code">💻</a> <a href="https://github.com/austinhuang0131/barinsta/commits?author=austinhuang0131" title="Documentation">📖</a> <a href="#question-austinhuang0131" title="Answering Questions">💬</a> <a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a> <a href="#ideas-austinhuang0131" title="Ideas, Planning, & Feedback">🤔</a></td>
     <td align="center"><a href="https://github.com/ammargitham"><img src="https://avatars0.githubusercontent.com/u/8017365?s=100" width="100px;" alt=""/><br /><sub><b>Ammar Githam</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=ammargitham" title="Code">💻</a> <a href="#design-ammargitham" title="Design">🎨</a> <a href="#ideas-ammargitham" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-ammargitham" title="Maintenance">🚧</a> <a href="#question-ammargitham" title="Answering Questions">💬</a></td>
+    <td align="center"><a href="https://github.com/zerrium"><img src="https://avatars.githubusercontent.com/u/58355441?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zerrium</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=zerrium" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/junhuicoding"><img src="https://avatars.githubusercontent.com/u/54289027?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chua Jun Hui</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=junhuicoding" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/andersonvom"><img src="https://avatars3.githubusercontent.com/u/69922?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anderson Mesquita</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=andersonvom" title="Code">💻</a> <a href="https://github.com/austinhuang0131/barinsta/issues?q=author%3Aandersonvom" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://vojtechh.eu/"><img src="https://avatars.githubusercontent.com/u/12630566?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vojtěch Hořánek</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=vojta-horanek" title="Code">💻</a> <a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://github.com/MeLlamoPablo"><img src="https://avatars.githubusercontent.com/u/11708035?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pablo Rodríguez</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=MeLlamoPablo" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Zopieux"><img src="https://avatars.githubusercontent.com/u/81353?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexandre Macabies</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/commits?author=Zopieux" title="Code">💻</a></td>
     <td align="center"><a href="https://snajdovski.github.io"><img src="https://avatars2.githubusercontent.com/u/42580385?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Stefan Najdovski</b></sub></a><br /><a href="#design-snajdovski" title="Design">🎨</a> <a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/CrazyMarvin"><img src="https://avatars3.githubusercontent.com/u/15004217?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CrazyMarvin</b></sub></a><br /><a href="#financial-CrazyMarvin" title="Financial">💵</a></td>
     <td align="center"><a href="http://kevinthomas.dev"><img src="https://avatars2.githubusercontent.com/u/15370181?s=100" width="100px;" alt=""/><br /><sub><b>Kevin Thomas</b></sub></a><br /><a href="#financial-KevinNThomas" title="Financial">💵</a></td>
     <td align="center"><a href="https://github.com/Shadowspear123"><img src="https://avatars1.githubusercontent.com/u/50462281?s=100" width="100px;" alt=""/><br /><sub><b>Shadowspear123</b></sub></a><br /><a href="#blog-Shadowspear123" title="Blogposts">📝</a> <a href="https://github.com/austinhuang0131/barinsta/issues?q=author%3AShadowspear123" title="Bug reports">🐛</a> <a href="#ideas-Shadowspear123" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-Shadowspear123" title="Answering Questions">💬</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://github.com/RickyM7"><img src="https://avatars3.githubusercontent.com/u/24703825?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ricardo</b></sub></a><br /><a href="https://github.com/austinhuang0131/barinsta/issues?q=author%3ARickyM7" title="Bug reports">🐛</a> <a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Akrai"><img src="https://avatars1.githubusercontent.com/u/5624597?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Akrai</b></sub></a><br /><a href="#ideas-Akrai" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/avtkal"><img src="https://avatars.githubusercontent.com/u/63205014?v=4?s=100" width="100px;" alt=""/><br /><sub><b>avtkal</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/cizordj"><img src="https://avatars2.githubusercontent.com/u/32869222?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cézar Augusto</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/dimitrist19"><img src="https://avatars.githubusercontent.com/u/56406468?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dimitris T</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/farzadx"><img src="https://avatars2.githubusercontent.com/u/70059397?v=4?s=100" width="100px;" alt=""/><br /><sub><b>farzadx</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://github.com/faydin"><img src="https://avatars2.githubusercontent.com/u/22706676?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fatih Aydın</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/fouze555"><img src="https://avatars3.githubusercontent.com/u/71935341?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fouze555</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Galang23"><img src="https://avatars3.githubusercontent.com/u/13700948?s=100" width="100px;" alt=""/><br /><sub><b>Galang23</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/initdebugs"><img src="https://avatars0.githubusercontent.com/u/75781464?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Initdebugs</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://janek.xyz/"><img src="https://avatars3.githubusercontent.com/u/8365659?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jakub Janek</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/GenosseFlosse"><img src="https://avatars.githubusercontent.com/u/59205524?v=4?s=100" width="100px;" alt=""/><br /><sub><b>GenosseFlosse</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://becauseofprog.fr/"><img src="https://avatars3.githubusercontent.com/u/24623168?s=100" width="100px;" alt=""/><br /><sub><b>kernoeb</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/MoaufmKlo"><img src="https://avatars1.githubusercontent.com/u/45636897?s=100" width="100px;" alt=""/><br /><sub><b>MoaufmKlo</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/nalinalini"><img src="https://avatars0.githubusercontent.com/u/65640431?v=4?s=100" width="100px;" alt=""/><br /><sub><b>nalinalini</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/peterge1998"><img src="https://avatars2.githubusercontent.com/u/47355238?s=100" width="100px;" alt=""/><br /><sub><b>peterge1998</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/PierreM0"><img src="https://avatars3.githubusercontent.com/u/71077853?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PierreM0</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Pyrobauve"><img src="https://avatars.githubusercontent.com/u/48654473?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pyrobauve</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://github.com/RAMAR-RAR"><img src="https://avatars3.githubusercontent.com/u/47423745?s=100" width="100px;" alt=""/><br /><sub><b>RAMAR-RAR</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/rohang02"><img src="https://avatars3.githubusercontent.com/u/47921164?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rohang02</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/retiolus"><img src="https://avatars1.githubusercontent.com/u/65604466?v=4?s=100" width="100px;" alt=""/><br /><sub><b>retiolus</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/rikishi0071"><img src="https://avatars3.githubusercontent.com/u/18183855?v=4?s=100" width="100px;" alt=""/><br /><sub><b>rikishi0071</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://gitlab.com/sandboiii"><img src="https://avatars.githubusercontent.com/u/17468894?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alexey Peschany</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Sitavi"><img src="https://avatars.githubusercontent.com/u/80586127?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sitavi</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://stillu.cc/"><img src="https://avatars2.githubusercontent.com/u/5843208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Still Hsu</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Lego8486"><img src="https://avatars1.githubusercontent.com/u/47414485?s=100" width="100px;" alt=""/><br /><sub><b>Ten_Lego</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/wagnim"><img src="https://avatars0.githubusercontent.com/u/30241419?s=100" width="100px;" alt=""/><br /><sub><b>wagnim</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
-  </tr>
-  <tr>
     <td align="center"><a href="https://github.com/wokija"><img src="https://avatars.githubusercontent.com/u/14982166?v=4?s=100" width="100px;" alt=""/><br /><sub><b>wokija</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/ysakamoto"><img src="https://avatars3.githubusercontent.com/u/1331642?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ysakamoto</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/ZDVokoun"><img src="https://avatars.githubusercontent.com/u/76393152?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ZDVokoun</b></sub></a><br /><a href="https://crowdin.com/project/instagrabber" title="Translation">🌍</a></td>
diff --git a/app/build.gradle b/app/build.gradle
index 33ab6b4d..4b000c17 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
 
-        versionCode 60
-        versionName '19.1.0'
+        versionCode 62
+        versionName '19.2.1'
 
         multiDexEnabled true
 
@@ -33,6 +33,12 @@ android {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
             }
         }
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    sourceSets {
+        androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
 
     compileOptions {
@@ -133,6 +139,13 @@ android {
             outputFileName = abi == null ? "barinsta_${suffix}.apk" : "barinsta_${suffix}_${abi}.apk"
         }
     }
+
+    packagingOptions {
+        // Exclude file to avoid
+        // Error: Duplicate files during packaging of APK
+        exclude 'META-INF/LICENSE.md'
+        exclude 'META-INF/LICENSE-notice.md'
+    }
 }
 
 configurations.all {
@@ -143,8 +156,8 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
     def appcompat_version = "1.2.0"
-    def nav_version = '2.3.4'
-    def exoplayer_version = '2.13.2'
+    def nav_version = '2.3.5'
+    def exoplayer_version = '2.13.3'
 
     implementation 'com.google.android.material:material:1.4.0-alpha02'
 
@@ -154,7 +167,7 @@ dependencies {
 
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
-    implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation "androidx.navigation:navigation-fragment:$nav_version"
@@ -174,18 +187,16 @@ dependencies {
     annotationProcessor "androidx.room:room-compiler:$room_version"
 
     // CameraX
-    def camerax_version = "1.1.0-alpha03"
+    def camerax_version = "1.1.0-alpha04"
     implementation "androidx.camera:camera-camera2:$camerax_version"
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
-    implementation "androidx.camera:camera-view:1.0.0-alpha22"
+    implementation "androidx.camera:camera-view:1.0.0-alpha24"
 
     // EmojiCompat
     def emoji_compat_version = "1.1.0"
     implementation "androidx.emoji:emoji:$emoji_compat_version"
     implementation "androidx.emoji:emoji-appcompat:$emoji_compat_version"
 
-    implementation 'me.austinhuang:AutoLinkTextViewV2:-SNAPSHOT'
-
     implementation 'com.facebook.fresco:fresco:2.3.0'
     implementation 'com.facebook.fresco:animated-webp:2.3.0'
     implementation 'com.facebook.fresco:webpsupport:2.3.0'
@@ -195,6 +206,10 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
     implementation 'org.apache.commons:commons-imaging:1.0-alpha2'
+
+    implementation 'com.github.skydoves:balloon:1.3.4'
+
+    implementation 'com.github.ammargitham:AutoLinkTextViewV2:v3.1.0'
     implementation 'com.github.ammargitham:uCrop:2.3-native-beta-2'
     implementation 'com.github.ammargitham:android-gpuimage:2.1.1-beta4'
 
@@ -203,4 +218,11 @@ dependencies {
     githubImplementation 'io.sentry:sentry-android:4.3.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+
+    androidTestImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation "androidx.room:room-testing:2.2.6"
+
 }
diff --git a/app/schemas/awais.instagrabber.db.AppDatabase/6.json b/app/schemas/awais.instagrabber.db.AppDatabase/6.json
new file mode 100644
index 00000000..4a2f5199
--- /dev/null
+++ b/app/schemas/awais.instagrabber.db.AppDatabase/6.json
@@ -0,0 +1,227 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 6,
+    "identityHash": "232e618b3bfcb4661336b359d036c455",
+    "entities": [
+      {
+        "tableName": "accounts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `uid` TEXT, `username` TEXT, `cookie` TEXT, `full_name` TEXT, `profile_pic` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "cookie",
+            "columnName": "cookie",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "fullName",
+            "columnName": "full_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "profilePic",
+            "columnName": "profile_pic",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "favorites",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `query_text` TEXT, `type` TEXT, `display_name` TEXT, `pic_url` TEXT, `date_added` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "query",
+            "columnName": "query_text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "display_name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "picUrl",
+            "columnName": "pic_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "dateAdded",
+            "columnName": "date_added",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "dm_last_notified",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `thread_id` TEXT, `last_notified_msg_ts` INTEGER, `last_notified_at` INTEGER)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "threadId",
+            "columnName": "thread_id",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastNotifiedMsgTs",
+            "columnName": "last_notified_msg_ts",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastNotifiedAt",
+            "columnName": "last_notified_at",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_dm_last_notified_thread_id",
+            "unique": true,
+            "columnNames": [
+              "thread_id"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_dm_last_notified_thread_id` ON `${TABLE_NAME}` (`thread_id`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "recent_searches",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `ig_id` TEXT NOT NULL, `name` TEXT NOT NULL, `username` TEXT, `pic_url` TEXT, `type` TEXT NOT NULL, `last_searched_on` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "igId",
+            "columnName": "ig_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "picUrl",
+            "columnName": "pic_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastSearchedOn",
+            "columnName": "last_searched_on",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_recent_searches_ig_id_type",
+            "unique": true,
+            "columnNames": [
+              "ig_id",
+              "type"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_recent_searches_ig_id_type` ON `${TABLE_NAME}` (`ig_id`, `type`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '232e618b3bfcb4661336b359d036c455')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/awais/instagrabber/db/MigrationTest.java b/app/src/androidTest/java/awais/instagrabber/db/MigrationTest.java
new file mode 100644
index 00000000..5156c5ff
--- /dev/null
+++ b/app/src/androidTest/java/awais/instagrabber/db/MigrationTest.java
@@ -0,0 +1,51 @@
+package awais.instagrabber.db;
+
+import androidx.room.Room;
+import androidx.room.migration.Migration;
+import androidx.room.testing.MigrationTestHelper;
+import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+import static awais.instagrabber.db.AppDatabase.MIGRATION_4_5;
+import static awais.instagrabber.db.AppDatabase.MIGRATION_5_6;
+
+@RunWith(AndroidJUnit4.class)
+public class MigrationTest {
+    private static final String TEST_DB = "migration-test";
+    private static final Migration[] ALL_MIGRATIONS = new Migration[]{MIGRATION_4_5, MIGRATION_5_6};
+
+    @Rule
+    public MigrationTestHelper helper;
+
+    public MigrationTest() {
+        final String canonicalName = AppDatabase.class.getCanonicalName();
+        assert canonicalName != null;
+        helper = new MigrationTestHelper(InstrumentationRegistry.getInstrumentation(),
+                                         canonicalName,
+                                         new FrameworkSQLiteOpenHelperFactory());
+    }
+
+    @Test
+    public void migrateAll() throws IOException {
+        // Create earliest version of the database. Have to start with 4 since that is the version we migrated to Room.
+        SupportSQLiteDatabase db = helper.createDatabase(TEST_DB, 4);
+        db.close();
+
+        // Open latest version of the database. Room will validate the schema
+        // once all migrations execute.
+        AppDatabase appDb = Room.databaseBuilder(InstrumentationRegistry.getInstrumentation().getTargetContext(),
+                                                 AppDatabase.class,
+                                                 TEST_DB)
+                                .addMigrations(ALL_MIGRATIONS).build();
+        appDb.getOpenHelper().getWritableDatabase();
+        appDb.close();
+    }
+}
diff --git a/app/src/androidTest/java/awais/instagrabber/db/dao/RecentSearchDaoTest.java b/app/src/androidTest/java/awais/instagrabber/db/dao/RecentSearchDaoTest.java
new file mode 100644
index 00000000..c8a48775
--- /dev/null
+++ b/app/src/androidTest/java/awais/instagrabber/db/dao/RecentSearchDaoTest.java
@@ -0,0 +1,82 @@
+package awais.instagrabber.db.dao;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.room.Room;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.runner.RunWith;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import awais.instagrabber.db.AppDatabase;
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.models.enums.FavoriteType;
+
+@RunWith(AndroidJUnit4.class)
+public class RecentSearchDaoTest {
+    private static final String TAG = RecentSearchDaoTest.class.getSimpleName();
+
+    private RecentSearchDao dao;
+    private AppDatabase db;
+
+    @Before
+    public void createDb() {
+        final Context context = ApplicationProvider.getApplicationContext();
+        db = Room.inMemoryDatabaseBuilder(context, AppDatabase.class).build();
+        dao = db.recentSearchDao();
+    }
+
+    @After
+    public void closeDb() {
+        db.close();
+    }
+
+    @Test
+    public void writeQueryDelete() {
+        final RecentSearch recentSearch = insertRecentSearch("1", "test1", FavoriteType.HASHTAG);
+        final RecentSearch byIgIdAndType = dao.getRecentSearchByIgIdAndType("1", FavoriteType.HASHTAG);
+        Assertions.assertEquals(recentSearch, byIgIdAndType);
+        dao.deleteRecentSearch(byIgIdAndType);
+        final RecentSearch deleted = dao.getRecentSearchByIgIdAndType("1", FavoriteType.HASHTAG);
+        Assertions.assertNull(deleted);
+    }
+
+    @Test
+    public void queryAllOrdered() {
+        final List<RecentSearch> insertListReversed = ImmutableList
+                .<RecentSearch>builder()
+                .add(insertRecentSearch("1", "test1", FavoriteType.HASHTAG))
+                .add(insertRecentSearch("2", "test2", FavoriteType.LOCATION))
+                .add(insertRecentSearch("3", "test3", FavoriteType.USER))
+                .add(insertRecentSearch("4", "test4", FavoriteType.USER))
+                .add(insertRecentSearch("5", "test5", FavoriteType.USER))
+                .build()
+                .reverse(); // important
+        final List<RecentSearch> fromDb = dao.getAllRecentSearches();
+        Assertions.assertIterableEquals(insertListReversed, fromDb);
+    }
+
+    @NonNull
+    private RecentSearch insertRecentSearch(final String igId, final String name, final FavoriteType type) {
+        final RecentSearch recentSearch = new RecentSearch(
+                igId,
+                name,
+                null,
+                null,
+                type,
+                LocalDateTime.now()
+        );
+        dao.insertRecentSearch(recentSearch);
+        return recentSearch;
+    }
+}
\ No newline at end of file
diff --git a/app/src/github/res/values-ca/strings.xml b/app/src/github/res/values-ca/strings.xml
new file mode 100644
index 00000000..599c258b
--- /dev/null
+++ b/app/src/github/res/values-ca/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Habilita el Sentry</string>
+    <string name="sentry_summary">Sentry és un oient/intèrpret d\'error que envia asíncronament l\'error/esdeveniment a Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry s\'iniciarà al pròxim llançament</string>
+</resources>
diff --git a/app/src/github/res/values-cs/strings.xml b/app/src/github/res/values-cs/strings.xml
new file mode 100644
index 00000000..f22f68c4
--- /dev/null
+++ b/app/src/github/res/values-cs/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Povolit Sentry</string>
+    <string name="sentry_summary">Sentry je listener/handler, který zaznamenává chyby a asynchronně je posílá na Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry se spustí při příštím spuštění</string>
+</resources>
diff --git a/app/src/github/res/values-de/strings.xml b/app/src/github/res/values-de/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-de/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-el/strings.xml b/app/src/github/res/values-el/strings.xml
new file mode 100644
index 00000000..579b3cc5
--- /dev/null
+++ b/app/src/github/res/values-el/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Ενεργοποίηση Sentry</string>
+    <string name="sentry_summary">Το Sentry είναι διαχειριστής σφαλμάτων ασύγχρονης αποστολής του σφάλματος/συμβάντος στο Sentry.io</string>
+    <string name="sentry_start_next_launch">Το Sentry θα ξεκινήσει στην επόμενη εκκίνηση</string>
+</resources>
diff --git a/app/src/github/res/values-es/strings.xml b/app/src/github/res/values-es/strings.xml
new file mode 100644
index 00000000..59f6cc24
--- /dev/null
+++ b/app/src/github/res/values-es/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Activar Sentry</string>
+    <string name="sentry_summary">Sentry es un oyente/manejador de errores que asincrónicamente envía el error/evento a Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry comenzará en el próximo inicio</string>
+</resources>
diff --git a/app/src/github/res/values-eu/strings.xml b/app/src/github/res/values-eu/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-eu/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-fa/strings.xml b/app/src/github/res/values-fa/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-fa/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-fr/strings.xml b/app/src/github/res/values-fr/strings.xml
new file mode 100644
index 00000000..74186f6f
--- /dev/null
+++ b/app/src/github/res/values-fr/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Activer Sentry</string>
+    <string name="sentry_summary">Sentry est un écouteur/gestionnaire d\'erreurs qui envoie de manière asynchrone l\'erreur/l\'événement à Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry commencera au prochain lancement</string>
+</resources>
diff --git a/app/src/github/res/values-hi/strings.xml b/app/src/github/res/values-hi/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-hi/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-in/strings.xml b/app/src/github/res/values-in/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-in/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-it/strings.xml b/app/src/github/res/values-it/strings.xml
new file mode 100644
index 00000000..99ec0ec1
--- /dev/null
+++ b/app/src/github/res/values-it/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Abilita Sentry</string>
+    <string name="sentry_summary">Sentry è un ascoltatore/gestore di errori che invia asincronicamente l\'errore/evento a Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry comincerà al prossimo lancio</string>
+</resources>
diff --git a/app/src/github/res/values-ja/strings.xml b/app/src/github/res/values-ja/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-ja/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-mk/strings.xml b/app/src/github/res/values-mk/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-mk/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-nl/strings.xml b/app/src/github/res/values-nl/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-nl/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-or/strings.xml b/app/src/github/res/values-or/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-or/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-pl/strings.xml b/app/src/github/res/values-pl/strings.xml
new file mode 100644
index 00000000..08b8c67e
--- /dev/null
+++ b/app/src/github/res/values-pl/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Włącz Sentry</string>
+    <string name="sentry_summary">Sentry jest słuchaczem/obsługą błędów, które asynchronicznie wysyłają błąd/zdarzenie do Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry rozpocznie się przy następnym uruchomieniu</string>
+</resources>
diff --git a/app/src/github/res/values-pt/strings.xml b/app/src/github/res/values-pt/strings.xml
new file mode 100644
index 00000000..7a0848a7
--- /dev/null
+++ b/app/src/github/res/values-pt/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Ativar Sentry</string>
+    <string name="sentry_summary">Sentry é um ouvinte/gestor de erros que assincronicamente envia o erro/evento para Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry começará no próximo início</string>
+</resources>
diff --git a/app/src/github/res/values-ru/strings.xml b/app/src/github/res/values-ru/strings.xml
new file mode 100644
index 00000000..0de74041
--- /dev/null
+++ b/app/src/github/res/values-ru/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Включить режим \"часового\"</string>
+    <string name="sentry_summary">\"Часовой\" - это слушатель/обработчик ошибок, который асинхронно отправляет ошибку/событие на Sentry.io</string>
+    <string name="sentry_start_next_launch">\"Часовой\" будет запущен при следующем запуске</string>
+</resources>
diff --git a/app/src/github/res/values-sk/strings.xml b/app/src/github/res/values-sk/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-sk/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-sv/strings.xml b/app/src/github/res/values-sv/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-sv/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-tr/strings.xml b/app/src/github/res/values-tr/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-tr/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-vi/strings.xml b/app/src/github/res/values-vi/strings.xml
new file mode 100644
index 00000000..078fa6a8
--- /dev/null
+++ b/app/src/github/res/values-vi/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">Enable Sentry</string>
+    <string name="sentry_summary">Sentry is a listener/handler for errors that asynchronously sends out the error/event to Sentry.io</string>
+    <string name="sentry_start_next_launch">Sentry will start on next launch</string>
+</resources>
diff --git a/app/src/github/res/values-zh-rCN/strings.xml b/app/src/github/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..8c4a510e
--- /dev/null
+++ b/app/src/github/res/values-zh-rCN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">启用 Sentry</string>
+    <string name="sentry_summary">Sentry 会将错误报告发送至 Sentry.io</string>
+    <string name="sentry_start_next_launch">启用 Sentry 将在下次启动应用时生效</string>
+</resources>
diff --git a/app/src/github/res/values-zh-rTW/strings.xml b/app/src/github/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..5d778fb0
--- /dev/null
+++ b/app/src/github/res/values-zh-rTW/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="enable_sentry">啟用 Sentry</string>
+    <string name="sentry_summary">Sentry 將會錯誤報告發送至 Sentry.io</string>
+    <string name="sentry_start_next_launch">下次啟用應用程式時將會開啟 Sentry</string>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce5e77c9..ed170657 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,6 +54,8 @@
                 <data android:scheme="https" />
                 <data android:host="ig.me" />
                 <data android:host="www.ig.me" />
+                <data android:host="instagr.am" />
+                <data android:host="www.instagr.am" />
                 <data android:host="instagram.com" />
                 <data android:host="www.instagram.com" />
                 <data android:pathPrefix="/" />
@@ -130,6 +132,9 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".activities.MainActivity" />
         </activity>
+        <activity
+            android:name=".utils.ProcessPhoenix"
+            android:theme="@style/Theme.AppCompat.Translucent" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -170,4 +175,4 @@
             android:value="Noto Color Emoji Compat" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/awais/instagrabber/InstaGrabberApplication.java b/app/src/main/java/awais/instagrabber/InstaGrabberApplication.java
index a033473d..4dcc9dde 100644
--- a/app/src/main/java/awais/instagrabber/InstaGrabberApplication.java
+++ b/app/src/main/java/awais/instagrabber/InstaGrabberApplication.java
@@ -26,6 +26,9 @@ import static awais.instagrabber.utils.Utils.clipboardManager;
 import static awais.instagrabber.utils.Utils.datetimeParser;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
+//import awaisomereport.LogCollector;
+//import static awais.instagrabber.utils.Utils.logCollector;
+
 public final class InstaGrabberApplication extends Application {
     private static final String TAG = "InstaGrabberApplication";
 
@@ -52,7 +55,7 @@ public final class InstaGrabberApplication extends Application {
                 Log.e(TAG, "Error", e);
             }
         }
-
+      
         // final Set<RequestListener> requestListeners = new HashSet<>();
         // requestListeners.add(new RequestLoggingListener());
         final ImagePipelineConfig imagePipelineConfig = ImagePipelineConfig
diff --git a/app/src/main/java/awais/instagrabber/activities/Login.java b/app/src/main/java/awais/instagrabber/activities/Login.java
index 37083794..879c92f3 100755
--- a/app/src/main/java/awais/instagrabber/activities/Login.java
+++ b/app/src/main/java/awais/instagrabber/activities/Login.java
@@ -24,7 +24,7 @@ import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
 import awais.instagrabber.utils.TextUtils;
 
-public final class Login extends BaseLanguageActivity implements View.OnClickListener, CompoundButton.OnCheckedChangeListener {
+public final class Login extends BaseLanguageActivity implements View.OnClickListener {
     private final WebViewClient webViewClient = new WebViewClient() {
         @Override
         public void onPageStarted(final WebView view, final String url, final Bitmap favicon) {
@@ -53,7 +53,7 @@ public final class Login extends BaseLanguageActivity implements View.OnClickLis
     }
 
     private final WebChromeClient webChromeClient = new WebChromeClient();
-    private String webViewUrl, defaultUserAgent;
+    private String webViewUrl;
     private boolean ready = false;
     private ActivityLoginBinding loginBinding;
 
@@ -65,7 +65,6 @@ public final class Login extends BaseLanguageActivity implements View.OnClickLis
 
         initWebView();
 
-        loginBinding.desktopMode.setOnCheckedChangeListener(this);
         loginBinding.cookies.setOnClickListener(this);
         loginBinding.refresh.setOnClickListener(this);
     }
@@ -86,23 +85,6 @@ public final class Login extends BaseLanguageActivity implements View.OnClickLis
         }
     }
 
-    @Override
-    public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {
-        final WebSettings webSettings = loginBinding.webView.getSettings();
-
-        final String newUserAgent = isChecked
-                                    ? "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36"
-                                    : defaultUserAgent;
-
-        webSettings.setUserAgentString(newUserAgent);
-        webSettings.setUseWideViewPort(isChecked);
-        webSettings.setLoadWithOverviewMode(isChecked);
-        webSettings.setSupportZoom(isChecked);
-        webSettings.setBuiltInZoomControls(isChecked);
-
-        loginBinding.webView.loadUrl("https://instagram.com/");
-    }
-
     @SuppressLint("SetJavaScriptEnabled")
     private void initWebView() {
         if (loginBinding != null) {
@@ -110,7 +92,7 @@ public final class Login extends BaseLanguageActivity implements View.OnClickLis
             loginBinding.webView.setWebViewClient(webViewClient);
             final WebSettings webSettings = loginBinding.webView.getSettings();
             if (webSettings != null) {
-                if (defaultUserAgent == null) defaultUserAgent = webSettings.getUserAgentString();
+                webSettings.setUserAgentString("Mozilla/5.0 (Linux; Android 10) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.105 Mobile Safari/537.36");
                 webSettings.setJavaScriptEnabled(true);
                 webSettings.setDomStorageEnabled(true);
                 webSettings.setSupportZoom(true);
diff --git a/app/src/main/java/awais/instagrabber/activities/MainActivity.java b/app/src/main/java/awais/instagrabber/activities/MainActivity.java
index b45a3200..9b052c8c 100644
--- a/app/src/main/java/awais/instagrabber/activities/MainActivity.java
+++ b/app/src/main/java/awais/instagrabber/activities/MainActivity.java
@@ -8,19 +8,18 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.provider.BaseColumns;
+import android.text.Editable;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.AutoCompleteTextView;
+import android.widget.EditText;
 import android.widget.Toast;
 
 import androidx.annotation.IdRes;
@@ -28,14 +27,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.provider.FontRequest;
 import androidx.emoji.text.EmojiCompat;
 import androidx.emoji.text.FontRequestEmojiCompatConfig;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
@@ -50,30 +47,27 @@ import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.badge.BadgeDrawable;
 import com.google.android.material.behavior.HideBottomViewOnScrollBehavior;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.textfield.TextInputLayout;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Deque;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import awais.instagrabber.BuildConfig;
 import awais.instagrabber.R;
-import awais.instagrabber.adapters.SuggestionsAdapter;
 import awais.instagrabber.asyncs.PostFetcher;
 import awais.instagrabber.customviews.emoji.EmojiVariantManager;
+import awais.instagrabber.customviews.helpers.TextWatcherAdapter;
 import awais.instagrabber.databinding.ActivityMainBinding;
 import awais.instagrabber.fragments.PostViewV2Fragment;
 import awais.instagrabber.fragments.directmessages.DirectMessageInboxFragmentDirections;
-import awais.instagrabber.fragments.main.FeedFragment;
 import awais.instagrabber.fragments.settings.PreferenceKeys;
 import awais.instagrabber.models.IntentModel;
 import awais.instagrabber.models.Tab;
-import awais.instagrabber.models.enums.SuggestionType;
-import awais.instagrabber.repositories.responses.search.SearchItem;
-import awais.instagrabber.repositories.responses.search.SearchResponse;
 import awais.instagrabber.services.ActivityCheckerService;
 import awais.instagrabber.services.DMSyncAlarmReceiver;
 import awais.instagrabber.utils.AppExecutors;
@@ -86,10 +80,7 @@ import awais.instagrabber.utils.Utils;
 import awais.instagrabber.utils.emoji.EmojiParser;
 import awais.instagrabber.viewmodels.AppStateViewModel;
 import awais.instagrabber.viewmodels.DirectInboxViewModel;
-import awais.instagrabber.webservices.SearchService;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
+import awais.instagrabber.webservices.RetrofitFactory;
 
 import static awais.instagrabber.utils.NavigationExtensions.setupWithNavController;
 import static awais.instagrabber.utils.Utils.settingsHelper;
@@ -98,16 +89,21 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
     private static final String TAG = "MainActivity";
     private static final String FIRST_FRAGMENT_GRAPH_INDEX_KEY = "firstFragmentGraphIndex";
     private static final String LAST_SELECT_NAV_MENU_ID = "lastSelectedNavMenuId";
+    private static final List<Integer> SEARCH_VISIBLE_DESTINATIONS = ImmutableList.of(
+            R.id.feedFragment,
+            R.id.profileFragment,
+            R.id.directMessagesInboxFragment,
+            R.id.discoverFragment,
+            R.id.favoritesFragment,
+            R.id.hashTagFragment,
+            R.id.locationFragment
+    );
+
+    private static MainActivity instance;
 
     private ActivityMainBinding binding;
     private LiveData<NavController> currentNavControllerLiveData;
     private MenuItem searchMenuItem;
-    private SuggestionsAdapter suggestionAdapter;
-    private AutoCompleteTextView searchAutoComplete;
-    private SearchView searchView;
-    private SearchService searchService;
-    private boolean showSearch = true;
-    private Handler suggestionsFetchHandler;
     private int firstFragmentGraphIndex;
     private int lastSelectedNavMenuId;
     private boolean isActivityCheckerServiceBound = false;
@@ -131,13 +127,16 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         }
     };
 
+    public static MainActivity getInstance() {
+        return instance;
+    }
+
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        instance = this;
         binding = ActivityMainBinding.inflate(getLayoutInflater());
-        final String cookie = settingsHelper.getString(Constants.COOKIE);
-        CookieUtils.setupCookies(cookie);
-        isLoggedIn = !TextUtils.isEmpty(cookie) && CookieUtils.getUserIdFromCookie(cookie) != 0;
+        setupCookie();
         if (settingsHelper.getBoolean(Constants.FLAG_SECURE))
             getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
         setContentView(binding.getRoot());
@@ -154,7 +153,6 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         if (savedInstanceState == null) {
             setupBottomNavigationBar(true);
         }
-        setupSuggestions();
         if (!BuildConfig.isPre) {
             final boolean checkUpdates = settingsHelper.getBoolean(Constants.CHECK_UPDATES);
             if (checkUpdates) FlavorTown.updateCheck(this);
@@ -163,7 +161,7 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         new ViewModelProvider(this).get(AppStateViewModel.class); // Just initiate the App state here
         final Intent intent = getIntent();
         handleIntent(intent);
-        if (!TextUtils.isEmpty(cookie) && settingsHelper.getBoolean(Constants.CHECK_ACTIVITY)) {
+        if (isLoggedIn && settingsHelper.getBoolean(Constants.CHECK_ACTIVITY)) {
             bindActivityCheckerService();
         }
         getSupportFragmentManager().addOnBackStackChangedListener(this);
@@ -173,9 +171,29 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
             EmojiVariantManager.getInstance();
         });
         initEmojiCompat();
-        searchService = SearchService.getInstance();
         // initDmService();
         initDmUnreadCount();
+        initSearchInput();
+    }
+
+    private void setupCookie() {
+        final String cookie = settingsHelper.getString(Constants.COOKIE);
+        long userId = 0;
+        String csrfToken = null;
+        if (!TextUtils.isEmpty(cookie)) {
+            userId = CookieUtils.getUserIdFromCookie(cookie);
+            csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
+        }
+        if (TextUtils.isEmpty(cookie) || userId == 0 || TextUtils.isEmpty(csrfToken)) {
+            isLoggedIn = false;
+            return;
+        }
+        final String deviceUuid = settingsHelper.getString(Constants.DEVICE_UUID);
+        if (TextUtils.isEmpty(deviceUuid)) {
+            settingsHelper.putString(Constants.DEVICE_UUID, UUID.randomUUID().toString());
+        }
+        CookieUtils.setupCookies(cookie);
+        isLoggedIn = true;
     }
 
     private void initDmService() {
@@ -195,25 +213,74 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         });
     }
 
+    private void initSearchInput() {
+        binding.searchInputLayout.setEndIconOnClickListener(v -> {
+            final EditText editText = binding.searchInputLayout.getEditText();
+            if (editText == null) return;
+            editText.setText("");
+        });
+        binding.searchInputLayout.addOnEditTextAttachedListener(textInputLayout -> {
+            textInputLayout.setEndIconVisible(false);
+            final EditText editText = textInputLayout.getEditText();
+            if (editText == null) return;
+            editText.addTextChangedListener(new TextWatcherAdapter() {
+                @Override
+                public void afterTextChanged(final Editable s) {
+                    binding.searchInputLayout.setEndIconVisible(!TextUtils.isEmpty(s));
+                }
+            });
+        });
+    }
+
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.main_menu, menu);
         searchMenuItem = menu.findItem(R.id.search);
-        if (showSearch && currentNavControllerLiveData != null) {
-            final NavController navController = currentNavControllerLiveData.getValue();
-            if (navController != null) {
-                final NavDestination currentDestination = navController.getCurrentDestination();
-                if (currentDestination != null) {
-                    final int destinationId = currentDestination.getId();
-                    showSearch = destinationId == R.id.profileFragment;
-                }
+        final NavController navController = currentNavControllerLiveData.getValue();
+        if (navController != null) {
+            final NavDestination currentDestination = navController.getCurrentDestination();
+            if (currentDestination != null) {
+                @SuppressLint("RestrictedApi") final Deque<NavBackStackEntry> backStack = navController.getBackStack();
+                setupMenu(backStack.size(), currentDestination.getId());
             }
         }
-        if (!showSearch) {
-            searchMenuItem.setVisible(false);
-            return true;
+        // if (binding.searchInputLayout.getVisibility() == View.VISIBLE) {
+        //     searchMenuItem.setVisible(false).setEnabled(false);
+        //     return true;
+        // }
+        // searchMenuItem.setVisible(true).setEnabled(true);
+        // if (showSearch && currentNavControllerLiveData != null) {
+        //     final NavController navController = currentNavControllerLiveData.getValue();
+        //     if (navController != null) {
+        //         final NavDestination currentDestination = navController.getCurrentDestination();
+        //         if (currentDestination != null) {
+        //             final int destinationId = currentDestination.getId();
+        //             showSearch = destinationId == R.id.profileFragment;
+        //         }
+        //     }
+        // }
+        // if (!showSearch) {
+        //     searchMenuItem.setVisible(false);
+        //     return true;
+        // }
+        // return setupSearchView();
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
+        if (item.getItemId() == R.id.search) {
+            final NavController navController = currentNavControllerLiveData.getValue();
+            if (navController == null) return false;
+            try {
+                navController.navigate(R.id.action_global_search);
+                return true;
+            } catch (Exception e) {
+                Log.e(TAG, "onOptionsItemSelected: ", e);
+            }
+            return false;
         }
-        return setupSearchView();
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
@@ -263,6 +330,12 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
             Log.e(TAG, "onDestroy: ", e);
         }
         unbindActivityCheckerService();
+        try {
+            RetrofitFactory.getInstance().destroy();
+        } catch (Exception e) {
+            Log.e(TAG, "onDestroy: ", e);
+        }
+        instance = null;
     }
 
     @Override
@@ -314,176 +387,6 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         notificationManager.createNotificationChannel(silentNotificationChannel);
     }
 
-    private void setupSuggestions() {
-        suggestionsFetchHandler = new Handler();
-        suggestionAdapter = new SuggestionsAdapter(this, (type, query) -> {
-            if (searchMenuItem != null) searchMenuItem.collapseActionView();
-            if (searchView != null && !searchView.isIconified()) searchView.setIconified(true);
-            if (currentNavControllerLiveData == null) return;
-            final NavController navController = currentNavControllerLiveData.getValue();
-            if (navController == null) return;
-            final Bundle bundle = new Bundle();
-            switch (type) {
-                case TYPE_LOCATION:
-                    bundle.putLong("locationId", Long.parseLong(query));
-                    navController.navigate(R.id.action_global_locationFragment, bundle);
-                    break;
-                case TYPE_HASHTAG:
-                    bundle.putString("hashtag", query);
-                    navController.navigate(R.id.action_global_hashTagFragment, bundle);
-                    break;
-                case TYPE_USER:
-                    bundle.putString("username", query);
-                    navController.navigate(R.id.action_global_profileFragment, bundle);
-                    break;
-            }
-        });
-    }
-
-    private boolean setupSearchView() {
-        final View actionView = searchMenuItem.getActionView();
-        if (!(actionView instanceof SearchView)) return false;
-        searchView = (SearchView) actionView;
-        searchView.setSuggestionsAdapter(suggestionAdapter);
-        searchView.setMaxWidth(Integer.MAX_VALUE);
-        final View searchText = searchView.findViewById(R.id.search_src_text);
-        if (searchText instanceof AutoCompleteTextView) {
-            searchAutoComplete = (AutoCompleteTextView) searchText;
-        }
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            private boolean searchUser;
-            private boolean searchHash;
-            private Call<SearchResponse> prevSuggestionAsync;
-            private final String[] COLUMNS = {
-                    BaseColumns._ID,
-                    Constants.EXTRAS_USERNAME,
-                    Constants.EXTRAS_NAME,
-                    Constants.EXTRAS_TYPE,
-                    "query",
-                    "pfp",
-                    "verified"
-            };
-            private String currentSearchQuery;
-
-            private final Callback<SearchResponse> cb = new Callback<SearchResponse>() {
-                @Override
-                public void onResponse(@NonNull final Call<SearchResponse> call,
-                                       @NonNull final Response<SearchResponse> response) {
-                    final MatrixCursor cursor;
-                    final SearchResponse body = response.body();
-                    if (body == null) {
-                        cursor = null;
-                        return;
-                    }
-                    final List<SearchItem> result = new ArrayList<>();
-                    if (isLoggedIn) {
-                        if (body.getList() != null) {
-                            result.addAll(searchHash ? body.getList()
-                                                           .stream()
-                                                           .filter(i -> i.getUser() == null)
-                                                           .collect(Collectors.toList())
-                                                     : body.getList());
-                        }
-                    } else {
-                        if (body.getUsers() != null && !searchHash) result.addAll(body.getUsers());
-                        if (body.getHashtags() != null) result.addAll(body.getHashtags());
-                        if (body.getPlaces() != null) result.addAll(body.getPlaces());
-                    }
-                    cursor = new MatrixCursor(COLUMNS, 0);
-                    for (int i = 0; i < result.size(); i++) {
-                        final SearchItem suggestionModel = result.get(i);
-                        if (suggestionModel != null) {
-                            Object[] objects = null;
-                            if (suggestionModel.getUser() != null)
-                                objects = new Object[]{
-                                        suggestionModel.getPosition(),
-                                        suggestionModel.getUser().getUsername(),
-                                        suggestionModel.getUser().getFullName(),
-                                        SuggestionType.TYPE_USER,
-                                        suggestionModel.getUser().getUsername(),
-                                        suggestionModel.getUser().getProfilePicUrl(),
-                                        suggestionModel.getUser().isVerified()};
-                            else if (suggestionModel.getHashtag() != null)
-                                objects = new Object[]{
-                                        suggestionModel.getPosition(),
-                                        suggestionModel.getHashtag().getName(),
-                                        suggestionModel.getHashtag().getSubtitle(),
-                                        SuggestionType.TYPE_HASHTAG,
-                                        suggestionModel.getHashtag().getName(),
-                                        "res:/" + R.drawable.ic_hashtag,
-                                        false};
-                            else if (suggestionModel.getPlace() != null)
-                                objects = new Object[]{
-                                        suggestionModel.getPosition(),
-                                        suggestionModel.getPlace().getTitle(),
-                                        suggestionModel.getPlace().getSubtitle(),
-                                        SuggestionType.TYPE_LOCATION,
-                                        suggestionModel.getPlace().getLocation().getPk(),
-                                        "res:/" + R.drawable.ic_location,
-                                        false};
-                            cursor.addRow(objects);
-                        }
-                    }
-                    suggestionAdapter.changeCursor(cursor);
-                }
-
-                @Override
-                public void onFailure(@NonNull final Call<SearchResponse> call,
-                                      @NonNull Throwable t) {
-                    if (!call.isCanceled()) {
-                        Log.e(TAG, "Exception on search:", t);
-                    }
-                }
-            };
-
-            private final Runnable runnable = () -> {
-                cancelSuggestionsAsync();
-                if (TextUtils.isEmpty(currentSearchQuery)) {
-                    suggestionAdapter.changeCursor(null);
-                    return;
-                }
-                searchUser = currentSearchQuery.charAt(0) == '@';
-                searchHash = currentSearchQuery.charAt(0) == '#';
-                if (currentSearchQuery.length() == 1 && (searchHash || searchUser)) {
-                    if (searchAutoComplete != null) {
-                        searchAutoComplete.setThreshold(2);
-                    }
-                } else {
-                    if (searchAutoComplete != null) {
-                        searchAutoComplete.setThreshold(1);
-                    }
-                    prevSuggestionAsync = searchService.search(isLoggedIn,
-                                                               searchUser || searchHash ? currentSearchQuery.substring(1)
-                                                                                        : currentSearchQuery,
-                                                               searchUser ? "user" : (searchHash ? "hashtag" : "blended"));
-                    suggestionAdapter.changeCursor(null);
-                    prevSuggestionAsync.enqueue(cb);
-                }
-            };
-
-            private void cancelSuggestionsAsync() {
-                if (prevSuggestionAsync != null)
-                    try {
-                        prevSuggestionAsync.cancel();
-                    } catch (final Exception ignored) {}
-            }
-
-            @Override
-            public boolean onQueryTextSubmit(final String query) {
-                return onQueryTextChange(query);
-            }
-
-            @Override
-            public boolean onQueryTextChange(final String query) {
-                suggestionsFetchHandler.removeCallbacks(runnable);
-                currentSearchQuery = query;
-                suggestionsFetchHandler.postDelayed(runnable, 800);
-                return true;
-            }
-        });
-        return true;
-    }
-
     private void setupBottomNavigationBar(final boolean setDefaultTabFromSettings) {
         currentTabs = !isLoggedIn ? setupAnonBottomNav() : setupMainBottomNav();
         final List<Integer> mainNavList = currentTabs.stream()
@@ -506,16 +409,6 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
                 firstFragmentGraphIndex);
         navControllerLiveData.observe(this, navController -> setupNavigation(binding.toolbar, navController));
         currentNavControllerLiveData = navControllerLiveData;
-        binding.bottomNavView.setOnNavigationItemReselectedListener(item -> {
-            // Log.d(TAG, "setupBottomNavigationBar: item: " + item);
-            final Fragment navHostFragment = getSupportFragmentManager().findFragmentById(R.id.main_nav_host);
-            if (navHostFragment != null) {
-                final Fragment fragment = navHostFragment.getChildFragmentManager().getPrimaryNavigationFragment();
-                if (fragment instanceof FeedFragment) {
-                    ((FeedFragment) fragment).scrollToTop();
-                }
-            }
-        });
     }
 
     private void setSelectedTab(final List<Tab> tabs) {
@@ -542,6 +435,13 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
 
     private List<Tab> setupAnonBottomNav() {
         final int selectedItemId = binding.bottomNavView.getSelectedItemId();
+        final Tab favoriteTab = new Tab(R.drawable.ic_star_24,
+                                        getString(R.string.title_favorites),
+                                        false,
+                                        "favorites_nav_graph",
+                                        R.navigation.favorites_nav_graph,
+                                        R.id.favorites_nav_graph,
+                                        R.id.favoritesFragment);
         final Tab profileTab = new Tab(R.drawable.ic_person_24,
                                        getString(R.string.profile),
                                        false,
@@ -558,12 +458,15 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
                                     R.id.morePreferencesFragment);
         final Menu menu = binding.bottomNavView.getMenu();
         menu.clear();
+        menu.add(0, favoriteTab.getNavigationRootId(), 0, favoriteTab.getTitle()).setIcon(favoriteTab.getIconResId());
         menu.add(0, profileTab.getNavigationRootId(), 0, profileTab.getTitle()).setIcon(profileTab.getIconResId());
         menu.add(0, moreTab.getNavigationRootId(), 0, moreTab.getTitle()).setIcon(moreTab.getIconResId());
-        if (selectedItemId != R.id.profile_nav_graph && selectedItemId != R.id.more_nav_graph) {
+        if (selectedItemId != R.id.profile_nav_graph
+                && selectedItemId != R.id.more_nav_graph
+                && selectedItemId != R.id.favorites_nav_graph) {
             setBottomNavSelectedTab(profileTab);
         }
-        return ImmutableList.of(profileTab, moreTab);
+        return ImmutableList.of(favoriteTab, profileTab, moreTab);
     }
 
     private List<Tab> setupMainBottomNav() {
@@ -584,20 +487,6 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         binding.bottomNavView.setSelectedItemId(navGraphRootId);
     }
 
-    // @NonNull
-    // private List<Integer> getMainNavList(final int main_nav_ids) {
-    //     final TypedArray navIds = getResources().obtainTypedArray(main_nav_ids);
-    //     final List<Integer> mainNavList = new ArrayList<>(navIds.length());
-    //     final int length = navIds.length();
-    //     for (int i = 0; i < length; i++) {
-    //         final int resourceId = navIds.getResourceId(i, -1);
-    //         if (resourceId < 0) continue;
-    //         mainNavList.add(resourceId);
-    //     }
-    //     navIds.recycle();
-    //     return mainNavList;
-    // }
-
     private void setupNavigation(final Toolbar toolbar, final NavController navController) {
         if (navController == null) return;
         NavigationUI.setupWithNavController(toolbar, navController);
@@ -616,11 +505,12 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
             @SuppressLint("RestrictedApi") final Deque<NavBackStackEntry> backStack = navController.getBackStack();
             setupMenu(backStack.size(), destinationId);
             final boolean contains = showBottomViewDestinations.contains(destinationId);
-            binding.bottomNavView.setVisibility(contains ? View.VISIBLE : View.GONE);
-            if (contains && behavior != null) {
-                behavior.slideUp(binding.bottomNavView);
-            }
-
+            binding.getRoot().post(() -> {
+                binding.bottomNavView.setVisibility(contains ? View.VISIBLE : View.GONE);
+                if (contains && behavior != null) {
+                    behavior.slideUp(binding.bottomNavView);
+                }
+            });
             // explicitly hide keyboard when we navigate
             final View view = getCurrentFocus();
             Utils.hideKeyboard(view);
@@ -629,12 +519,10 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
 
     private void setupMenu(final int backStackSize, final int destinationId) {
         if (searchMenuItem == null) return;
-        if (backStackSize >= 2 && destinationId == R.id.profileFragment) {
-            showSearch = true;
+        if (backStackSize >= 2 && SEARCH_VISIBLE_DESTINATIONS.contains(destinationId)) {
             searchMenuItem.setVisible(true);
             return;
         }
-        showSearch = false;
         searchMenuItem.setVisible(false);
     }
 
@@ -765,7 +653,11 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         if (navController == null) return;
         final Bundle bundle = new Bundle();
         bundle.putString("username", "@" + username);
-        navController.navigate(R.id.action_global_profileFragment, bundle);
+        try {
+            navController.navigate(R.id.action_global_profileFragment, bundle);
+        } catch (Exception e) {
+            Log.e(TAG, "showProfileView: ", e);
+        }
     }
 
     private void showPostView(@NonNull final IntentModel intentModel) {
@@ -778,11 +670,16 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         alertDialog.show();
         new PostFetcher(shortCode, feedModel -> {
             if (feedModel != null) {
-                final PostViewV2Fragment fragment = PostViewV2Fragment
-                        .builder(feedModel)
-                        .build();
-                fragment.setOnShowListener(dialog -> alertDialog.dismiss());
-                fragment.show(getSupportFragmentManager(), "post_view");
+                if (currentNavControllerLiveData == null) return;
+                final NavController navController = currentNavControllerLiveData.getValue();
+                if (navController == null) return;
+                final Bundle bundle = new Bundle();
+                bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+                try {
+                    navController.navigate(R.id.action_global_post_view, bundle);
+                } catch (Exception e) {
+                    Log.e(TAG, "showPostView: ", e);
+                }
                 return;
             }
             Toast.makeText(getApplicationContext(), R.string.post_not_found, Toast.LENGTH_SHORT).show();
@@ -838,11 +735,19 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
     }
 
     public void setCollapsingView(@NonNull final View view) {
-        binding.collapsingToolbarLayout.addView(view, 0);
+        try {
+            binding.collapsingToolbarLayout.addView(view, 0);
+        } catch (Exception e) {
+            Log.e(TAG, "setCollapsingView: ", e);
+        }
     }
 
     public void removeCollapsingView(@NonNull final View view) {
-        binding.collapsingToolbarLayout.removeView(view);
+        try {
+            binding.collapsingToolbarLayout.removeView(view);
+        } catch (Exception e) {
+            Log.e(TAG, "removeCollapsingView: ", e);
+        }
     }
 
     public void setToolbar(final Toolbar toolbar) {
@@ -905,14 +810,14 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         return binding.toolbar;
     }
 
+    public View getRootView() {
+        return binding.getRoot();
+    }
+
     public List<Tab> getCurrentTabs() {
         return currentTabs;
     }
 
-//    public boolean isNavRootInCurrentTabs(@IdRes final int navRootId) {
-//        return showBottomViewDestinations.stream().anyMatch(id -> id == navRootId);
-//    }
-
     private void setNavBarDMUnreadCountBadge(final int unseenCount) {
         final BadgeDrawable badge = binding.bottomNavView.getOrCreateBadge(R.id.direct_messages_nav_graph);
         if (badge == null) return;
@@ -927,4 +832,14 @@ public class MainActivity extends BaseLanguageActivity implements FragmentManage
         badge.setNumber(unseenCount);
         badge.setVisible(true);
     }
+
+    @NonNull
+    public TextInputLayout showSearchView() {
+        binding.searchInputLayout.setVisibility(View.VISIBLE);
+        return binding.searchInputLayout;
+    }
+
+    public void hideSearchView() {
+        binding.searchInputLayout.setVisibility(View.GONE);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/CommentsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/CommentsAdapter.java
index d88e5f34..d4de8ca6 100755
--- a/app/src/main/java/awais/instagrabber/adapters/CommentsAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/CommentsAdapter.java
@@ -1,195 +1,60 @@
 package awais.instagrabber.adapters;
 
-import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
-import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.Objects;
 
-import awais.instagrabber.adapters.viewholder.comments.ChildCommentViewHolder;
-import awais.instagrabber.adapters.viewholder.comments.ParentCommentViewHolder;
+import awais.instagrabber.adapters.viewholder.CommentViewHolder;
 import awais.instagrabber.databinding.ItemCommentBinding;
-import awais.instagrabber.databinding.ItemCommentSmallBinding;
-import awais.instagrabber.models.CommentModel;
+import awais.instagrabber.models.Comment;
 
-public final class CommentsAdapter extends ListAdapter<CommentModel, RecyclerView.ViewHolder> {
-    private static final int TYPE_PARENT = 1;
-    private static final int TYPE_CHILD = 2;
-
-    private final Map<Integer, Integer> positionTypeMap = new HashMap<>();
-
-    // private final Filter filter = new Filter() {
-    //     @NonNull
-    //     @Override
-    //     protected FilterResults performFiltering(final CharSequence filter) {
-    //         final FilterResults results = new FilterResults();
-    //         results.values = commentModels;
-    //
-    //         final int commentsLen = commentModels == null ? 0 : commentModels.size();
-    //         if (commentModels != null && commentsLen > 0 && !TextUtils.isEmpty(filter)) {
-    //             final String query = filter.toString().toLowerCase();
-    //             final ArrayList<CommentModel> filterList = new ArrayList<>(commentsLen);
-    //
-    //             for (final CommentModel commentModel : commentModels) {
-    //                 final String commentText = commentModel.getText().toString().toLowerCase();
-    //
-    //                 if (commentText.contains(query)) filterList.add(commentModel);
-    //                 else {
-    //                     final List<CommentModel> childCommentModels = commentModel.getChildCommentModels();
-    //                     if (childCommentModels != null) {
-    //                         for (final CommentModel childCommentModel : childCommentModels) {
-    //                             final String childCommentText = childCommentModel.getText().toString().toLowerCase();
-    //                             if (childCommentText.contains(query)) filterList.add(commentModel);
-    //                         }
-    //                     }
-    //                 }
-    //             }
-    //             filterList.trimToSize();
-    //             results.values = filterList.toArray(new CommentModel[0]);
-    //         }
-    //
-    //         return results;
-    //     }
-    //
-    //     @Override
-    //     protected void publishResults(final CharSequence constraint, @NonNull final FilterResults results) {
-    //         if (results.values instanceof List) {
-    //             //noinspection unchecked
-    //             filteredCommentModels = (List<CommentModel>) results.values;
-    //             notifyDataSetChanged();
-    //         }
-    //     }
-    // };
-
-    private static final DiffUtil.ItemCallback<CommentModel> DIFF_CALLBACK = new DiffUtil.ItemCallback<CommentModel>() {
+public final class CommentsAdapter extends ListAdapter<Comment, CommentViewHolder> {
+    private static final DiffUtil.ItemCallback<Comment> DIFF_CALLBACK = new DiffUtil.ItemCallback<Comment>() {
         @Override
-        public boolean areItemsTheSame(@NonNull final CommentModel oldItem, @NonNull final CommentModel newItem) {
-            return oldItem.getId().equals(newItem.getId());
+        public boolean areItemsTheSame(@NonNull final Comment oldItem, @NonNull final Comment newItem) {
+            return Objects.equals(oldItem.getId(), newItem.getId());
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull final CommentModel oldItem, @NonNull final CommentModel newItem) {
-            return oldItem.getId().equals(newItem.getId());
+        public boolean areContentsTheSame(@NonNull final Comment oldItem, @NonNull final Comment newItem) {
+            return Objects.equals(oldItem, newItem);
         }
     };
-    private final CommentCallback commentCallback;
-    private CommentModel selected, toChangeLike;
-    private int selectedIndex, likedIndex;
 
-    public CommentsAdapter(final CommentCallback commentCallback) {
+    private final boolean showingReplies;
+    private final CommentCallback commentCallback;
+    private final long currentUserId;
+
+    public CommentsAdapter(final long currentUserId,
+                           final boolean showingReplies,
+                           final CommentCallback commentCallback) {
         super(DIFF_CALLBACK);
+        this.showingReplies = showingReplies;
+        this.currentUserId = currentUserId;
         this.commentCallback = commentCallback;
     }
 
     @NonNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int type) {
-        final Context context = parent.getContext();
-        final LayoutInflater layoutInflater = LayoutInflater.from(context);
-        if (type == TYPE_PARENT) {
-            final ItemCommentBinding binding = ItemCommentBinding.inflate(layoutInflater, parent, false);
-            return new ParentCommentViewHolder(binding);
-        }
-        final ItemCommentSmallBinding binding = ItemCommentSmallBinding.inflate(layoutInflater, parent, false);
-        return new ChildCommentViewHolder(binding);
+    public CommentViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int type) {
+        final LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
+        final ItemCommentBinding binding = ItemCommentBinding.inflate(layoutInflater, parent, false);
+        return new CommentViewHolder(binding, currentUserId, commentCallback);
     }
 
     @Override
-    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position) {
-        CommentModel commentModel = getItem(position);
-        if (commentModel == null) return;
-        final int type = getItemViewType(position);
-        final boolean selected = this.selected != null && this.selected.getId().equals(commentModel.getId());
-        final boolean toLike = this.toChangeLike != null && this.toChangeLike.getId().equals(commentModel.getId());
-        if (toLike) commentModel = this.toChangeLike;
-        if (type == TYPE_PARENT) {
-            final ParentCommentViewHolder viewHolder = (ParentCommentViewHolder) holder;
-            viewHolder.bind(commentModel, selected, commentCallback);
-            return;
-        }
-        final ChildCommentViewHolder viewHolder = (ChildCommentViewHolder) holder;
-        viewHolder.bind(commentModel, selected, commentCallback);
-    }
-
-    @Override
-    public void submitList(@Nullable final List<CommentModel> list) {
-        final List<CommentModel> flatList = flattenList(list);
-        super.submitList(flatList);
-    }
-
-    @Override
-    public void submitList(@Nullable final List<CommentModel> list, @Nullable final Runnable commitCallback) {
-        final List<CommentModel> flatList = flattenList(list);
-        super.submitList(flatList, commitCallback);
-    }
-
-    private List<CommentModel> flattenList(final List<CommentModel> list) {
-        if (list == null) {
-            return Collections.emptyList();
-        }
-        final List<CommentModel> flatList = new ArrayList<>();
-        int lastCommentIndex = -1;
-        for (final CommentModel parent : list) {
-            lastCommentIndex++;
-            flatList.add(parent);
-            positionTypeMap.put(lastCommentIndex, TYPE_PARENT);
-            final List<CommentModel> children = parent.getChildCommentModels();
-            if (children != null) {
-                for (final CommentModel child : children) {
-                    lastCommentIndex++;
-                    flatList.add(child);
-                    positionTypeMap.put(lastCommentIndex, TYPE_CHILD);
-                }
-            }
-        }
-        return flatList;
-    }
-
-
-    @Override
-    public int getItemViewType(final int position) {
-        final Integer type = positionTypeMap.get(position);
-        if (type == null) {
-            return TYPE_PARENT;
-        }
-        return type;
-    }
-
-    public void setSelected(final CommentModel commentModel) {
-        this.selected = commentModel;
-        selectedIndex = getCurrentList().indexOf(commentModel);
-        notifyItemChanged(selectedIndex);
-    }
-
-    public void clearSelection() {
-        this.selected = null;
-        notifyItemChanged(selectedIndex);
-    }
-
-    public void setLiked(final CommentModel commentModel, final boolean liked) {
-        likedIndex = getCurrentList().indexOf(commentModel);
-        CommentModel newCommentModel = commentModel;
-        newCommentModel.setLiked(liked);
-        this.toChangeLike = newCommentModel;
-        notifyItemChanged(likedIndex);
-    }
-
-    public CommentModel getSelected() {
-        return selected;
+    public void onBindViewHolder(@NonNull final CommentViewHolder holder, final int position) {
+        final Comment comment = getItem(position);
+        holder.bind(comment, showingReplies && position == 0, showingReplies && position != 0);
     }
 
     public interface CommentCallback {
-        void onClick(final CommentModel comment);
+        void onClick(final Comment comment);
 
         void onHashtagClick(final String hashtag);
 
@@ -198,5 +63,15 @@ public final class CommentsAdapter extends ListAdapter<CommentModel, RecyclerVie
         void onURLClick(final String url);
 
         void onEmailClick(final String emailAddress);
+
+        void onLikeClick(final Comment comment, boolean liked, final boolean isReply);
+
+        void onRepliesClick(final Comment comment);
+
+        void onViewLikes(Comment comment);
+
+        void onTranslate(Comment comment);
+
+        void onDelete(Comment comment, boolean isReply);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
index 2b1f410e..2673d787 100644
--- a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
@@ -406,6 +406,8 @@ public final class DirectItemsAdapter extends RecyclerView.Adapter<RecyclerView.
         void onReactionClick(DirectItem item, int position);
 
         void onOptionSelect(DirectItem item, @IdRes int itemId, final Function<DirectItem, Void> callback);
+
+        void onAddReactionListener(DirectItem item);
     }
 
     public interface DirectItemInternalLongClickListener {
diff --git a/app/src/main/java/awais/instagrabber/adapters/FavoritesAdapter.java b/app/src/main/java/awais/instagrabber/adapters/FavoritesAdapter.java
index d697343a..b9d89ce7 100644
--- a/app/src/main/java/awais/instagrabber/adapters/FavoritesAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/FavoritesAdapter.java
@@ -19,7 +19,7 @@ import java.util.List;
 import awais.instagrabber.R;
 import awais.instagrabber.adapters.viewholder.FavoriteViewHolder;
 import awais.instagrabber.databinding.ItemFavSectionHeaderBinding;
-import awais.instagrabber.databinding.ItemSuggestionBinding;
+import awais.instagrabber.databinding.ItemSearchResultBinding;
 import awais.instagrabber.db.entities.Favorite;
 import awais.instagrabber.models.enums.FavoriteType;
 
@@ -73,7 +73,7 @@ public class FavoritesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
             // header
             return new FavSectionViewHolder(ItemFavSectionHeaderBinding.inflate(inflater, parent, false));
         }
-        final ItemSuggestionBinding binding = ItemSuggestionBinding.inflate(inflater, parent, false);
+        final ItemSearchResultBinding binding = ItemSearchResultBinding.inflate(inflater, parent, false);
         return new FavoriteViewHolder(binding);
     }
 
diff --git a/app/src/main/java/awais/instagrabber/adapters/LikesAdapter.java b/app/src/main/java/awais/instagrabber/adapters/LikesAdapter.java
index ea509c5c..aad654a0 100755
--- a/app/src/main/java/awais/instagrabber/adapters/LikesAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/LikesAdapter.java
@@ -34,7 +34,7 @@ public final class LikesAdapter extends RecyclerView.Adapter<FollowsViewHolder>
     @Override
     public void onBindViewHolder(@NonNull final FollowsViewHolder holder, final int position) {
         final User model = profileModels.get(position);
-        holder.bind(model, null, onClickListener);
+        holder.bind(model, onClickListener);
     }
 
     @Override
diff --git a/app/src/main/java/awais/instagrabber/adapters/SearchCategoryAdapter.java b/app/src/main/java/awais/instagrabber/adapters/SearchCategoryAdapter.java
new file mode 100644
index 00000000..9f6887fd
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/adapters/SearchCategoryAdapter.java
@@ -0,0 +1,33 @@
+package awais.instagrabber.adapters;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import java.util.List;
+
+import awais.instagrabber.fragments.search.SearchCategoryFragment;
+import awais.instagrabber.models.enums.FavoriteType;
+
+public class SearchCategoryAdapter extends FragmentStateAdapter {
+
+    private final List<FavoriteType> categories;
+
+    public SearchCategoryAdapter(@NonNull final Fragment fragment,
+                                 @NonNull final List<FavoriteType> categories) {
+        super(fragment);
+        this.categories = categories;
+
+    }
+
+    @NonNull
+    @Override
+    public Fragment createFragment(final int position) {
+        return SearchCategoryFragment.newInstance(categories.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return categories.size();
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/adapters/SearchItemsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/SearchItemsAdapter.java
new file mode 100644
index 00000000..e26059de
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/adapters/SearchItemsAdapter.java
@@ -0,0 +1,215 @@
+package awais.instagrabber.adapters;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.AdapterListUpdateCallback;
+import androidx.recyclerview.widget.AsyncDifferConfig;
+import androidx.recyclerview.widget.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.viewholder.SearchItemViewHolder;
+import awais.instagrabber.databinding.ItemFavSectionHeaderBinding;
+import awais.instagrabber.databinding.ItemSearchResultBinding;
+import awais.instagrabber.fragments.search.SearchCategoryFragment.OnSearchItemClickListener;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+
+public final class SearchItemsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+    private static final String TAG = SearchItemsAdapter.class.getSimpleName();
+    private static final DiffUtil.ItemCallback<SearchItemOrHeader> DIFF_CALLBACK = new DiffUtil.ItemCallback<SearchItemOrHeader>() {
+        @Override
+        public boolean areItemsTheSame(@NonNull final SearchItemOrHeader oldItem, @NonNull final SearchItemOrHeader newItem) {
+            return Objects.equals(oldItem, newItem);
+        }
+
+        @Override
+        public boolean areContentsTheSame(@NonNull final SearchItemOrHeader oldItem, @NonNull final SearchItemOrHeader newItem) {
+            return Objects.equals(oldItem, newItem);
+        }
+    };
+    private static final String RECENT = "recent";
+    private static final String FAVORITE = "favorite";
+    private static final int VIEW_TYPE_HEADER = 0;
+    private static final int VIEW_TYPE_ITEM = 1;
+
+    private final OnSearchItemClickListener onSearchItemClickListener;
+    private final AsyncListDiffer<SearchItemOrHeader> differ;
+
+    public SearchItemsAdapter(final OnSearchItemClickListener onSearchItemClickListener) {
+        differ = new AsyncListDiffer<>(new AdapterListUpdateCallback(this),
+                                       new AsyncDifferConfig.Builder<>(DIFF_CALLBACK).build());
+        this.onSearchItemClickListener = onSearchItemClickListener;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
+        final LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
+        if (viewType == VIEW_TYPE_HEADER) {
+            return new HeaderViewHolder(ItemFavSectionHeaderBinding.inflate(layoutInflater, parent, false));
+        }
+        final ItemSearchResultBinding binding = ItemSearchResultBinding.inflate(layoutInflater, parent, false);
+        return new SearchItemViewHolder(binding, onSearchItemClickListener);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position) {
+        if (getItemViewType(position) == VIEW_TYPE_HEADER) {
+            final SearchItemOrHeader searchItemOrHeader = getItem(position);
+            if (!searchItemOrHeader.isHeader()) return;
+            ((HeaderViewHolder) holder).bind(searchItemOrHeader.header);
+            return;
+        }
+        ((SearchItemViewHolder) holder).bind(getItem(position).searchItem);
+    }
+
+    protected SearchItemOrHeader getItem(int position) {
+        return differ.getCurrentList().get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return differ.getCurrentList().size();
+    }
+
+    @Override
+    public int getItemViewType(final int position) {
+        return getItem(position).isHeader() ? VIEW_TYPE_HEADER : VIEW_TYPE_ITEM;
+    }
+
+    public void submitList(@Nullable final List<SearchItem> list) {
+        if (list == null) {
+            differ.submitList(null);
+            return;
+        }
+        differ.submitList(sectionAndSort(list));
+    }
+
+    public void submitList(@Nullable final List<SearchItem> list, @Nullable final Runnable commitCallback) {
+        if (list == null) {
+            differ.submitList(null, commitCallback);
+            return;
+        }
+        differ.submitList(sectionAndSort(list), commitCallback);
+    }
+
+    @NonNull
+    private List<SearchItemOrHeader> sectionAndSort(@NonNull final List<SearchItem> list) {
+        final boolean containsRecentOrFavorite = list.stream().anyMatch(searchItem -> searchItem.isRecent() || searchItem.isFavorite());
+        // Don't do anything if not showing recent results
+        if (!containsRecentOrFavorite) {
+            return list.stream()
+                       .map(SearchItemOrHeader::new)
+                       .collect(Collectors.toList());
+        }
+        final List<SearchItem> listCopy = new ArrayList<>(list);
+        Collections.sort(listCopy, (o1, o2) -> {
+            final boolean bothRecent = o1.isRecent() && o2.isRecent();
+            if (bothRecent) {
+                // Don't sort
+                return 0;
+            }
+            final boolean bothFavorite = o1.isFavorite() && o2.isFavorite();
+            if (bothFavorite) {
+                if (o1.getType() == o2.getType()) return 0;
+                // keep users at top
+                if (o1.getType() == FavoriteType.USER) return -1;
+                if (o2.getType() == FavoriteType.USER) return 1;
+                // keep locations at bottom
+                if (o1.getType() == FavoriteType.LOCATION) return 1;
+                if (o2.getType() == FavoriteType.LOCATION) return -1;
+            }
+            // keep recents at top
+            if (o1.isRecent()) return -1;
+            if (o2.isRecent()) return 1;
+            return 0;
+        });
+        final List<SearchItemOrHeader> itemOrHeaders = new ArrayList<>();
+        for (int i = 0; i < listCopy.size(); i++) {
+            final SearchItem searchItem = listCopy.get(i);
+            final SearchItemOrHeader prev = itemOrHeaders.isEmpty() ? null : itemOrHeaders.get(itemOrHeaders.size() - 1);
+            boolean prevWasSameType = prev != null && ((prev.searchItem.isRecent() && searchItem.isRecent())
+                    || (prev.searchItem.isFavorite() && searchItem.isFavorite()));
+            if (prevWasSameType) {
+                // just add the item
+                itemOrHeaders.add(new SearchItemOrHeader(searchItem));
+                continue;
+            }
+            // add header and item
+            // add header only if search item is recent or favorite
+            if (searchItem.isRecent() || searchItem.isFavorite()) {
+                itemOrHeaders.add(new SearchItemOrHeader(searchItem.isRecent() ? RECENT : FAVORITE));
+            }
+            itemOrHeaders.add(new SearchItemOrHeader(searchItem));
+        }
+        return itemOrHeaders;
+    }
+
+    private static class SearchItemOrHeader {
+        String header;
+        SearchItem searchItem;
+
+        public SearchItemOrHeader(final SearchItem searchItem) {
+            this.searchItem = searchItem;
+        }
+
+        public SearchItemOrHeader(final String header) {
+            this.header = header;
+        }
+
+        boolean isHeader() {
+            return header != null;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            final SearchItemOrHeader that = (SearchItemOrHeader) o;
+            return Objects.equals(header, that.header) &&
+                    Objects.equals(searchItem, that.searchItem);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(header, searchItem);
+        }
+    }
+
+    public static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        private final ItemFavSectionHeaderBinding binding;
+
+        public HeaderViewHolder(@NonNull final ItemFavSectionHeaderBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        public void bind(final String header) {
+            if (header == null) return;
+            final int headerText;
+            switch (header) {
+                case RECENT:
+                    headerText = R.string.recent;
+                    break;
+                case FAVORITE:
+                    headerText = R.string.title_favorites;
+                    break;
+                default:
+                    headerText = R.string.unknown;
+                    break;
+            }
+            binding.getRoot().setText(headerText);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/SliderCallbackAdapter.java b/app/src/main/java/awais/instagrabber/adapters/SliderCallbackAdapter.java
index 1cfec468..a92192eb 100644
--- a/app/src/main/java/awais/instagrabber/adapters/SliderCallbackAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/SliderCallbackAdapter.java
@@ -1,11 +1,17 @@
 package awais.instagrabber.adapters;
 
+import android.view.View;
+
+import com.google.android.exoplayer2.ui.StyledPlayerView;
+
+import awais.instagrabber.repositories.responses.Media;
+
 public class SliderCallbackAdapter implements SliderItemsAdapter.SliderCallback {
     @Override
     public void onThumbnailLoaded(final int position) {}
 
     @Override
-    public void onItemClicked(final int position) {}
+    public void onItemClicked(final int position, final Media media, final View view) {}
 
     @Override
     public void onPlayerPlay(final int position) {}
@@ -15,4 +21,12 @@ public class SliderCallbackAdapter implements SliderItemsAdapter.SliderCallback
 
     @Override
     public void onPlayerRelease(final int position) {}
+
+    @Override
+    public void onFullScreenModeChanged(final boolean isFullScreen, final StyledPlayerView playerView) {}
+
+    @Override
+    public boolean isInFullScreen() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/adapters/SliderItemsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/SliderItemsAdapter.java
index c805d316..2d036fb1 100644
--- a/app/src/main/java/awais/instagrabber/adapters/SliderItemsAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/SliderItemsAdapter.java
@@ -1,28 +1,27 @@
 package awais.instagrabber.adapters;
 
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.ListAdapter;
 
+import com.google.android.exoplayer2.ui.StyledPlayerView;
+
 import awais.instagrabber.adapters.viewholder.SliderItemViewHolder;
 import awais.instagrabber.adapters.viewholder.SliderPhotoViewHolder;
 import awais.instagrabber.adapters.viewholder.SliderVideoViewHolder;
-import awais.instagrabber.customviews.VerticalDragHelper;
 import awais.instagrabber.databinding.ItemSliderPhotoBinding;
-import awais.instagrabber.databinding.LayoutExoCustomControlsBinding;
 import awais.instagrabber.databinding.LayoutVideoPlayerWithThumbnailBinding;
 import awais.instagrabber.models.enums.MediaItemType;
 import awais.instagrabber.repositories.responses.Media;
 
 public final class SliderItemsAdapter extends ListAdapter<Media, SliderItemViewHolder> {
 
-    private final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener;
     private final boolean loadVideoOnItemClick;
     private final SliderCallback sliderCallback;
-    private final LayoutExoCustomControlsBinding controlsBinding;
 
     private static final DiffUtil.ItemCallback<Media> DIFF_CALLBACK = new DiffUtil.ItemCallback<Media>() {
         @Override
@@ -36,15 +35,11 @@ public final class SliderItemsAdapter extends ListAdapter<Media, SliderItemViewH
         }
     };
 
-    public SliderItemsAdapter(final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener,
-                              final LayoutExoCustomControlsBinding controlsBinding,
-                              final boolean loadVideoOnItemClick,
+    public SliderItemsAdapter(final boolean loadVideoOnItemClick,
                               final SliderCallback sliderCallback) {
         super(DIFF_CALLBACK);
-        this.onVerticalDragListener = onVerticalDragListener;
         this.loadVideoOnItemClick = loadVideoOnItemClick;
         this.sliderCallback = sliderCallback;
-        this.controlsBinding = controlsBinding;
     }
 
     @NonNull
@@ -55,12 +50,12 @@ public final class SliderItemsAdapter extends ListAdapter<Media, SliderItemViewH
         switch (mediaItemType) {
             case MEDIA_TYPE_VIDEO: {
                 final LayoutVideoPlayerWithThumbnailBinding binding = LayoutVideoPlayerWithThumbnailBinding.inflate(inflater, parent, false);
-                return new SliderVideoViewHolder(binding, onVerticalDragListener, controlsBinding, loadVideoOnItemClick);
+                return new SliderVideoViewHolder(binding, loadVideoOnItemClick);
             }
             case MEDIA_TYPE_IMAGE:
             default:
                 final ItemSliderPhotoBinding binding = ItemSliderPhotoBinding.inflate(inflater, parent, false);
-                return new SliderPhotoViewHolder(binding, onVerticalDragListener);
+                return new SliderPhotoViewHolder(binding);
         }
     }
 
@@ -143,12 +138,16 @@ public final class SliderItemsAdapter extends ListAdapter<Media, SliderItemViewH
     public interface SliderCallback {
         void onThumbnailLoaded(int position);
 
-        void onItemClicked(int position);
+        void onItemClicked(int position, final Media media, final View view);
 
         void onPlayerPlay(int position);
 
         void onPlayerPause(int position);
 
         void onPlayerRelease(int position);
+
+        void onFullScreenModeChanged(boolean isFullScreen, final StyledPlayerView playerView);
+
+        boolean isInFullScreen();
     }
 }
diff --git a/app/src/main/java/awais/instagrabber/adapters/SuggestionsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/SuggestionsAdapter.java
deleted file mode 100755
index 6c51f1f7..00000000
--- a/app/src/main/java/awais/instagrabber/adapters/SuggestionsAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package awais.instagrabber.adapters;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.cursoradapter.widget.CursorAdapter;
-
-import awais.instagrabber.databinding.ItemSuggestionBinding;
-import awais.instagrabber.models.enums.SuggestionType;
-
-public final class SuggestionsAdapter extends CursorAdapter {
-    private static final String TAG = "SuggestionsAdapter";
-
-    private final OnSuggestionClickListener onSuggestionClickListener;
-
-    public SuggestionsAdapter(final Context context,
-                              final OnSuggestionClickListener onSuggestionClickListener) {
-        super(context, null, FLAG_REGISTER_CONTENT_OBSERVER);
-        this.onSuggestionClickListener = onSuggestionClickListener;
-    }
-
-    @Override
-    public View newView(final Context context, final Cursor cursor, final ViewGroup parent) {
-        final LayoutInflater layoutInflater = LayoutInflater.from(context);
-        final ItemSuggestionBinding binding = ItemSuggestionBinding.inflate(layoutInflater, parent, false);
-        return binding.getRoot();
-        // return layoutInflater.inflate(R.layout.item_suggestion, parent, false);
-    }
-
-    @Override
-    public void bindView(@NonNull final View view, final Context context, @NonNull final Cursor cursor) {
-        // i, username, fullname, type, query, picUrl, verified
-        // 0, 1       , 2       , 3   , 4    , 5     , 6
-        final String fullName = cursor.getString(2);
-        String username = cursor.getString(1);
-        String picUrl = cursor.getString(5);
-        final boolean verified = cursor.getString(6).charAt(0) == 't';
-
-        final String type = cursor.getString(3);
-        SuggestionType suggestionType = null;
-        try {
-            suggestionType = SuggestionType.valueOf(type);
-        } catch (IllegalArgumentException e) {
-            Log.e(TAG, "Unknown suggestion type: " + type, e);
-        }
-        if (suggestionType == null) return;
-        String query = cursor.getString(4);
-        switch (suggestionType) {
-            case TYPE_USER:
-                username = '@' + username;
-                break;
-            case TYPE_HASHTAG:
-                username = '#' + username;
-                break;
-        }
-
-        if (onSuggestionClickListener != null) {
-            final SuggestionType finalSuggestionType = suggestionType;
-            view.setOnClickListener(v -> onSuggestionClickListener.onSuggestionClick(finalSuggestionType, query));
-        }
-        final ItemSuggestionBinding binding = ItemSuggestionBinding.bind(view);
-        binding.isVerified.setVisibility(verified ? View.VISIBLE : View.GONE);
-        binding.tvUsername.setText(username);
-        binding.tvFullName.setVisibility(View.VISIBLE);
-        binding.tvFullName.setText(fullName);
-        binding.ivProfilePic.setImageURI(picUrl);
-    }
-
-    public interface OnSuggestionClickListener {
-        void onSuggestionClick(final SuggestionType type, final String query);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/CommentViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/CommentViewHolder.java
new file mode 100644
index 00000000..151d308c
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/CommentViewHolder.java
@@ -0,0 +1,209 @@
+package awais.instagrabber.adapters.viewholder;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.TypedValue;
+import android.view.Menu;
+import android.view.View;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.CommentsAdapter.CommentCallback;
+import awais.instagrabber.customviews.ProfilePicView;
+import awais.instagrabber.databinding.ItemCommentBinding;
+import awais.instagrabber.models.Comment;
+import awais.instagrabber.repositories.responses.User;
+import awais.instagrabber.utils.Utils;
+
+public final class CommentViewHolder extends RecyclerView.ViewHolder {
+
+    private final ItemCommentBinding binding;
+    private final long currentUserId;
+    private final CommentCallback commentCallback;
+    @ColorInt
+    private int parentCommentHighlightColor;
+    private PopupMenu optionsPopup;
+
+    public CommentViewHolder(@NonNull final ItemCommentBinding binding,
+                             final long currentUserId,
+                             final CommentCallback commentCallback) {
+        super(binding.getRoot());
+        this.binding = binding;
+        this.currentUserId = currentUserId;
+        this.commentCallback = commentCallback;
+        final Context context = itemView.getContext();
+        if (context == null) return;
+        final Resources.Theme theme = context.getTheme();
+        if (theme == null) return;
+        final TypedValue typedValue = new TypedValue();
+        final boolean resolved = theme.resolveAttribute(R.attr.parentCommentHighlightColor, typedValue, true);
+        if (resolved) {
+            parentCommentHighlightColor = typedValue.data;
+        }
+    }
+
+    public void bind(final Comment comment, final boolean isReplyParent, final boolean isReply) {
+        if (comment == null) return;
+        itemView.setOnClickListener(v -> {
+            if (commentCallback != null) {
+                commentCallback.onClick(comment);
+            }
+        });
+        if (isReplyParent && parentCommentHighlightColor != 0) {
+            itemView.setBackgroundColor(parentCommentHighlightColor);
+        } else {
+            itemView.setBackgroundColor(itemView.getResources().getColor(android.R.color.transparent));
+        }
+        setupCommentText(comment, isReply);
+        binding.date.setText(comment.getDateTime());
+        setLikes(comment, isReply);
+        setReplies(comment, isReply);
+        setUser(comment, isReply);
+        setupOptions(comment, isReply);
+    }
+
+    private void setupCommentText(@NonNull final Comment comment, final boolean isReply) {
+        binding.comment.clearOnURLClickListeners();
+        binding.comment.clearOnHashtagClickListeners();
+        binding.comment.clearOnMentionClickListeners();
+        binding.comment.clearOnEmailClickListeners();
+        binding.comment.setText(comment.getText());
+        binding.comment.setTextSize(TypedValue.COMPLEX_UNIT_SP, isReply ? 12 : 14);
+        binding.comment.addOnHashtagListener(autoLinkItem -> {
+            final String originalText = autoLinkItem.getOriginalText();
+            if (commentCallback == null) return;
+            commentCallback.onHashtagClick(originalText);
+        });
+        binding.comment.addOnMentionClickListener(autoLinkItem -> {
+            final String originalText = autoLinkItem.getOriginalText();
+            if (commentCallback == null) return;
+            commentCallback.onMentionClick(originalText);
+
+        });
+        binding.comment.addOnEmailClickListener(autoLinkItem -> {
+            final String originalText = autoLinkItem.getOriginalText();
+            if (commentCallback == null) return;
+            commentCallback.onEmailClick(originalText);
+        });
+        binding.comment.addOnURLClickListener(autoLinkItem -> {
+            final String originalText = autoLinkItem.getOriginalText();
+            if (commentCallback == null) return;
+            commentCallback.onURLClick(originalText);
+        });
+        binding.comment.setOnLongClickListener(v -> {
+            Utils.copyText(itemView.getContext(), comment.getText());
+            return true;
+        });
+        binding.comment.setOnClickListener(v -> commentCallback.onClick(comment));
+    }
+
+    private void setUser(@NonNull final Comment comment, final boolean isReply) {
+        final User user = comment.getUser();
+        if (user == null) return;
+        binding.username.setUsername(user.getUsername(), user.isVerified());
+        binding.username.setTextAppearance(itemView.getContext(), isReply ? R.style.TextAppearance_MaterialComponents_Subtitle2
+                                                                          : R.style.TextAppearance_MaterialComponents_Subtitle1);
+        binding.username.setOnClickListener(v -> {
+            if (commentCallback == null) return;
+            commentCallback.onMentionClick("@" + user.getUsername());
+        });
+        binding.profilePic.setImageURI(user.getProfilePicUrl());
+        binding.profilePic.setSize(isReply ? ProfilePicView.Size.SMALLER : ProfilePicView.Size.SMALL);
+        binding.profilePic.setOnClickListener(v -> {
+            if (commentCallback == null) return;
+            commentCallback.onMentionClick("@" + user.getUsername());
+        });
+    }
+
+    private void setLikes(@NonNull final Comment comment, final boolean isReply) {
+        // final String likesString = itemView.getResources().getQuantityString(R.plurals.likes_count, likes, likes);
+        binding.likes.setText(String.valueOf(comment.getLikes()));
+        binding.likes.setOnLongClickListener(v -> {
+            if (commentCallback == null) return false;
+            commentCallback.onViewLikes(comment);
+            return true;
+        });
+        if (currentUserId == 0) { // not logged in
+            binding.likes.setOnClickListener(v -> {
+                if (commentCallback == null) return;
+                commentCallback.onViewLikes(comment);
+            });
+            return;
+        }
+        final boolean liked = comment.getLiked();
+        final int resId = liked ? R.drawable.ic_like : R.drawable.ic_not_liked;
+        binding.likes.setCompoundDrawablesRelativeWithSize(ContextCompat.getDrawable(itemView.getContext(), resId), null, null, null);
+        binding.likes.setOnClickListener(v -> {
+            if (commentCallback == null) return;
+            // toggle like
+            commentCallback.onLikeClick(comment, !liked, isReply);
+        });
+    }
+
+    private void setReplies(@NonNull final Comment comment, final boolean isReply) {
+        final int replies = comment.getReplyCount();
+        binding.replies.setVisibility(View.VISIBLE);
+        final String text = isReply ? "" : String.valueOf(replies);
+        // final String string = itemView.getResources().getQuantityString(R.plurals.replies_count, replies, replies);
+        binding.replies.setText(text);
+        binding.replies.setOnClickListener(v -> {
+            if (commentCallback == null) return;
+            commentCallback.onRepliesClick(comment);
+        });
+    }
+
+    private void setupOptions(final Comment comment, final boolean isReply) {
+        binding.options.setOnClickListener(v -> {
+            if (optionsPopup == null) {
+                createOptionsPopupMenu(comment, isReply);
+            }
+            if (optionsPopup == null) return;
+            optionsPopup.show();
+        });
+    }
+
+    private void createOptionsPopupMenu(final Comment comment, final boolean isReply) {
+        if (optionsPopup == null) {
+            final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(itemView.getContext(), R.style.popupMenuStyle);
+            optionsPopup = new PopupMenu(themeWrapper, binding.options);
+        } else {
+            optionsPopup.getMenu().clear();
+        }
+        optionsPopup.getMenuInflater().inflate(R.menu.comment_options_menu, optionsPopup.getMenu());
+        final User user = comment.getUser();
+        if (currentUserId == 0 || user == null || user.getPk() != currentUserId) {
+            final Menu menu = optionsPopup.getMenu();
+            menu.removeItem(R.id.delete);
+        }
+        optionsPopup.setOnMenuItemClickListener(item -> {
+            if (commentCallback == null) return false;
+            int itemId = item.getItemId();
+            if (itemId == R.id.translate) {
+                commentCallback.onTranslate(comment);
+                return true;
+            }
+            if (itemId == R.id.delete) {
+                commentCallback.onDelete(comment, isReply);
+            }
+            return true;
+        });
+    }
+
+    // private void setupReply(final Comment comment) {
+    //     if (!isLoggedIn) {
+    //         binding.reply.setVisibility(View.GONE);
+    //         return;
+    //     }
+    //     binding.reply.setOnClickListener(v -> {
+    //         if (commentCallback == null) return;
+    //         // toggle like
+    //         commentCallback.onReplyClick(comment);
+    //     });
+    // }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/FavoriteViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/FavoriteViewHolder.java
index e16824ea..bf9da891 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/FavoriteViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/FavoriteViewHolder.java
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import awais.instagrabber.adapters.FavoritesAdapter;
-import awais.instagrabber.databinding.ItemSuggestionBinding;
+import awais.instagrabber.databinding.ItemSearchResultBinding;
 import awais.instagrabber.db.entities.Favorite;
 import awais.instagrabber.models.enums.FavoriteType;
 import awais.instagrabber.utils.Constants;
@@ -14,12 +14,12 @@ import awais.instagrabber.utils.Constants;
 public class FavoriteViewHolder extends RecyclerView.ViewHolder {
     private static final String TAG = "FavoriteViewHolder";
 
-    private final ItemSuggestionBinding binding;
+    private final ItemSearchResultBinding binding;
 
-    public FavoriteViewHolder(@NonNull final ItemSuggestionBinding binding) {
+    public FavoriteViewHolder(@NonNull final ItemSearchResultBinding binding) {
         super(binding.getRoot());
         this.binding = binding;
-        binding.isVerified.setVisibility(View.GONE);
+        binding.verified.setVisibility(View.GONE);
     }
 
     public void bind(final Favorite model,
@@ -36,12 +36,12 @@ public class FavoriteViewHolder extends RecyclerView.ViewHolder {
             return longClickListener.onLongClick(model);
         });
         if (model.getType() == FavoriteType.HASHTAG) {
-            binding.ivProfilePic.setImageURI(Constants.DEFAULT_HASH_TAG_PIC);
+            binding.profilePic.setImageURI(Constants.DEFAULT_HASH_TAG_PIC);
         } else {
-            binding.ivProfilePic.setImageURI(model.getPicUrl());
+            binding.profilePic.setImageURI(model.getPicUrl());
         }
-        binding.tvFullName.setText(model.getDisplayName());
-        binding.tvUsername.setVisibility(View.VISIBLE);
+        binding.title.setVisibility(View.VISIBLE);
+        binding.subtitle.setText(model.getDisplayName());
         String query = model.getQuery();
         switch (model.getType()) {
             case HASHTAG:
@@ -51,11 +51,11 @@ public class FavoriteViewHolder extends RecyclerView.ViewHolder {
                 query = "@" + query;
                 break;
             case LOCATION:
-                binding.tvUsername.setVisibility(View.GONE);
+                binding.title.setVisibility(View.GONE);
                 break;
             default:
                 // do nothing
         }
-        binding.tvUsername.setText(query);
+        binding.title.setText(query);
     }
 }
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/FollowsViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/FollowsViewHolder.java
index 6f48be53..1274bd2b 100755
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/FollowsViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/FollowsViewHolder.java
@@ -2,10 +2,9 @@ package awais.instagrabber.adapters.viewholder;
 
 import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import java.util.List;
-
 import awais.instagrabber.databinding.ItemFollowBinding;
 import awais.instagrabber.models.FollowModel;
 import awais.instagrabber.repositories.responses.User;
@@ -14,23 +13,19 @@ public final class FollowsViewHolder extends RecyclerView.ViewHolder {
 
     private final ItemFollowBinding binding;
 
-    public FollowsViewHolder(final ItemFollowBinding binding) {
+    public FollowsViewHolder(@NonNull final ItemFollowBinding binding) {
         super(binding.getRoot());
         this.binding = binding;
     }
 
     public void bind(final User model,
-                     final List<Long> admins,
                      final View.OnClickListener onClickListener) {
         if (model == null) return;
         itemView.setTag(model);
         itemView.setOnClickListener(onClickListener);
-        binding.tvUsername.setText(model.getUsername());
-        binding.tvFullName.setText(model.getFullName());
-        if (admins != null && admins.contains(model.getPk())) {
-            binding.isAdmin.setVisibility(View.VISIBLE);
-        }
-        binding.ivProfilePic.setImageURI(model.getProfilePicUrl());
+        binding.username.setUsername("@" + model.getUsername(), model.isVerified());
+        binding.fullName.setText(model.getFullName());
+        binding.profilePic.setImageURI(model.getProfilePicUrl());
     }
 
     public void bind(final FollowModel model,
@@ -38,8 +33,8 @@ public final class FollowsViewHolder extends RecyclerView.ViewHolder {
         if (model == null) return;
         itemView.setTag(model);
         itemView.setOnClickListener(onClickListener);
-        binding.tvUsername.setText(model.getUsername());
-        binding.tvFullName.setText(model.getFullName());
-        binding.ivProfilePic.setImageURI(model.getProfilePicUrl());
+        binding.username.setUsername("@" + model.getUsername());
+        binding.fullName.setText(model.getFullName());
+        binding.profilePic.setImageURI(model.getProfilePicUrl());
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/SearchItemViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/SearchItemViewHolder.java
new file mode 100644
index 00000000..4eb93fed
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/SearchItemViewHolder.java
@@ -0,0 +1,80 @@
+package awais.instagrabber.adapters.viewholder;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import awais.instagrabber.R;
+import awais.instagrabber.databinding.ItemSearchResultBinding;
+import awais.instagrabber.fragments.search.SearchCategoryFragment.OnSearchItemClickListener;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.Hashtag;
+import awais.instagrabber.repositories.responses.Place;
+import awais.instagrabber.repositories.responses.User;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+
+public class SearchItemViewHolder extends RecyclerView.ViewHolder {
+
+    private final ItemSearchResultBinding binding;
+    private final OnSearchItemClickListener onSearchItemClickListener;
+
+    public SearchItemViewHolder(@NonNull final ItemSearchResultBinding binding,
+                                final OnSearchItemClickListener onSearchItemClickListener) {
+        super(binding.getRoot());
+        this.binding = binding;
+        this.onSearchItemClickListener = onSearchItemClickListener;
+    }
+
+    public void bind(final SearchItem searchItem) {
+        if (searchItem == null) return;
+        final FavoriteType type = searchItem.getType();
+        if (type == null) return;
+        String title;
+        String subtitle;
+        String picUrl;
+        boolean isVerified = false;
+        switch (type) {
+            case USER:
+                final User user = searchItem.getUser();
+                title = "@" + user.getUsername();
+                subtitle = user.getFullName();
+                picUrl = user.getProfilePicUrl();
+                isVerified = user.isVerified();
+                break;
+            case HASHTAG:
+                final Hashtag hashtag = searchItem.getHashtag();
+                title = "#" + hashtag.getName();
+                subtitle = hashtag.getSubtitle();
+                picUrl = "res:/" + R.drawable.ic_hashtag;
+                break;
+            case LOCATION:
+                final Place place = searchItem.getPlace();
+                title = place.getTitle();
+                subtitle = place.getSubtitle();
+                picUrl = "res:/" + R.drawable.ic_location;
+                break;
+            default:
+                return;
+        }
+        itemView.setOnClickListener(v -> {
+            if (onSearchItemClickListener != null) {
+                onSearchItemClickListener.onSearchItemClick(searchItem);
+            }
+        });
+        binding.delete.setVisibility(searchItem.isRecent() ? View.VISIBLE : View.GONE);
+        if (searchItem.isRecent()) {
+            binding.delete.setEnabled(true);
+            binding.delete.setOnClickListener(v -> {
+                if (onSearchItemClickListener != null) {
+                    binding.delete.setEnabled(false);
+                    onSearchItemClickListener.onSearchItemDelete(searchItem);
+                }
+            });
+        }
+        binding.title.setText(title);
+        binding.subtitle.setText(subtitle);
+        binding.profilePic.setImageURI(picUrl);
+        binding.verified.setVisibility(isVerified ? View.VISIBLE : View.GONE);
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderPhotoViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderPhotoViewHolder.java
index 37479a4f..914ee5e9 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderPhotoViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderPhotoViewHolder.java
@@ -2,7 +2,6 @@ package awais.instagrabber.adapters.viewholder;
 
 import android.graphics.drawable.Animatable;
 import android.net.Uri;
-import android.view.GestureDetector;
 import android.view.MotionEvent;
 
 import androidx.annotation.NonNull;
@@ -14,8 +13,8 @@ import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 
 import awais.instagrabber.adapters.SliderItemsAdapter;
-import awais.instagrabber.customviews.VerticalDragHelper;
 import awais.instagrabber.customviews.drawee.AnimatedZoomableController;
+import awais.instagrabber.customviews.drawee.DoubleTapGestureListener;
 import awais.instagrabber.databinding.ItemSliderPhotoBinding;
 import awais.instagrabber.repositories.responses.Media;
 import awais.instagrabber.utils.ResponseBodyUtils;
@@ -24,13 +23,10 @@ public class SliderPhotoViewHolder extends SliderItemViewHolder {
     private static final String TAG = "FeedSliderPhotoViewHolder";
 
     private final ItemSliderPhotoBinding binding;
-    private final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener;
 
-    public SliderPhotoViewHolder(@NonNull final ItemSliderPhotoBinding binding,
-                                 final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener) {
+    public SliderPhotoViewHolder(@NonNull final ItemSliderPhotoBinding binding) {
         super(binding.getRoot());
         this.binding = binding;
-        this.onVerticalDragListener = onVerticalDragListener;
     }
 
     public void bind(@NonNull final Media model,
@@ -62,74 +58,19 @@ public class SliderPhotoViewHolder extends SliderItemViewHolder {
                                     })
                                     .setLowResImageRequest(ImageRequest.fromUri(ResponseBodyUtils.getThumbUrl(model)))
                                     .build());
-        // binding.getRoot().setOnClickListener(v -> {
-        //     if (sliderCallback != null) {
-        //         sliderCallback.onItemClicked(position);
-        //     }
-        // });
-        binding.getRoot().setTapListener(new GestureDetector.SimpleOnGestureListener() {
+        final DoubleTapGestureListener tapListener = new DoubleTapGestureListener(binding.getRoot()) {
             @Override
-            public boolean onSingleTapUp(final MotionEvent e) {
+            public boolean onSingleTapConfirmed(final MotionEvent e) {
                 if (sliderCallback != null) {
-                    sliderCallback.onItemClicked(position);
-                    return true;
+                    sliderCallback.onItemClicked(position, model, binding.getRoot());
                 }
-                return false;
+                return super.onSingleTapConfirmed(e);
             }
-        });
+        };
+        binding.getRoot().setTapListener(tapListener);
         final AnimatedZoomableController zoomableController = AnimatedZoomableController.newInstance();
         zoomableController.setMaxScaleFactor(3f);
         binding.getRoot().setZoomableController(zoomableController);
-        if (onVerticalDragListener != null) {
-            binding.getRoot().setOnVerticalDragListener(onVerticalDragListener);
-        }
+        binding.getRoot().setZoomingEnabled(true);
     }
-
-    // private void setDimensions(final FeedModel feedModel, final int spanCount, final boolean animate) {
-    //     final ViewGroup.LayoutParams layoutParams = binding.imageViewer.getLayoutParams();
-    //     final int deviceWidth = Utils.displayMetrics.widthPixels;
-    //     final int spanWidth = deviceWidth / spanCount;
-    //     final int spanHeight = NumberUtils.getResultingHeight(spanWidth, feedModel.getImageHeight(), feedModel.getImageWidth());
-    //     final int width = spanWidth == 0 ? deviceWidth : spanWidth;
-    //     final int height = spanHeight == 0 ? deviceWidth + 1 : spanHeight;
-    //     if (animate) {
-    //         Animation animation = AnimationUtils.expand(
-    //                 binding.imageViewer,
-    //                 layoutParams.width,
-    //                 layoutParams.height,
-    //                 width,
-    //                 height,
-    //                 new Animation.AnimationListener() {
-    //                     @Override
-    //                     public void onAnimationStart(final Animation animation) {
-    //                         showOrHideDetails(spanCount);
-    //                     }
-    //
-    //                     @Override
-    //                     public void onAnimationEnd(final Animation animation) {
-    //                         // showOrHideDetails(spanCount);
-    //                     }
-    //
-    //                     @Override
-    //                     public void onAnimationRepeat(final Animation animation) {
-    //
-    //                     }
-    //                 });
-    //         binding.imageViewer.startAnimation(animation);
-    //     } else {
-    //         layoutParams.width = width;
-    //         layoutParams.height = height;
-    //         binding.imageViewer.requestLayout();
-    //     }
-    // }
-    //
-    // private void showOrHideDetails(final int spanCount) {
-    //     if (spanCount == 1) {
-    //         binding.itemFeedTop.getRoot().setVisibility(View.VISIBLE);
-    //         binding.itemFeedBottom.getRoot().setVisibility(View.VISIBLE);
-    //     } else {
-    //         binding.itemFeedTop.getRoot().setVisibility(View.GONE);
-    //         binding.itemFeedBottom.getRoot().setVisibility(View.GONE);
-    //     }
-    // }
 }
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderVideoViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderVideoViewHolder.java
index c62cf711..3624d7ef 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderVideoViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/SliderVideoViewHolder.java
@@ -7,13 +7,13 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 
+import com.google.android.exoplayer2.ui.StyledPlayerView;
+
 import java.util.List;
 
 import awais.instagrabber.adapters.SliderItemsAdapter;
-import awais.instagrabber.customviews.VerticalDragHelper;
 import awais.instagrabber.customviews.VideoPlayerCallbackAdapter;
 import awais.instagrabber.customviews.VideoPlayerViewHelper;
-import awais.instagrabber.databinding.LayoutExoCustomControlsBinding;
 import awais.instagrabber.databinding.LayoutVideoPlayerWithThumbnailBinding;
 import awais.instagrabber.repositories.responses.Media;
 import awais.instagrabber.repositories.responses.VideoVersion;
@@ -28,40 +28,23 @@ public class SliderVideoViewHolder extends SliderItemViewHolder {
     private static final String TAG = "SliderVideoViewHolder";
 
     private final LayoutVideoPlayerWithThumbnailBinding binding;
-    private final LayoutExoCustomControlsBinding controlsBinding;
     private final boolean loadVideoOnItemClick;
-    private final GestureDetector.OnGestureListener videoPlayerViewGestureListener = new GestureDetector.SimpleOnGestureListener() {
-        @Override
-        public boolean onSingleTapConfirmed(final MotionEvent e) {
-            binding.playerView.performClick();
-            return true;
-        }
-    };
 
     private VideoPlayerViewHelper videoPlayerViewHelper;
 
     @SuppressLint("ClickableViewAccessibility")
     public SliderVideoViewHolder(@NonNull final LayoutVideoPlayerWithThumbnailBinding binding,
-                                 final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener,
-                                 final LayoutExoCustomControlsBinding controlsBinding,
                                  final boolean loadVideoOnItemClick) {
         super(binding.getRoot());
         this.binding = binding;
-        this.controlsBinding = controlsBinding;
         this.loadVideoOnItemClick = loadVideoOnItemClick;
-        // if (onVerticalDragListener != null) {
-        //     final VerticalDragHelper thumbnailVerticalDragHelper = new VerticalDragHelper(binding.thumbnailParent);
-        //     final VerticalDragHelper playerVerticalDragHelper = new VerticalDragHelper(binding.playerView);
-        //     thumbnailVerticalDragHelper.setOnVerticalDragListener(onVerticalDragListener);
-        //     playerVerticalDragHelper.setOnVerticalDragListener(onVerticalDragListener);
-        //     binding.thumbnailParent.setOnTouchListener((v, event) -> {
-        //         final boolean onDragTouch = thumbnailVerticalDragHelper.onDragTouch(event);
-        //         if (onDragTouch) {
-        //             return true;
-        //         }
-        //         return thumbnailVerticalDragHelper.onGestureTouchEvent(event);
-        //     });
-        // }
+        final GestureDetector.OnGestureListener videoPlayerViewGestureListener = new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapConfirmed(final MotionEvent e) {
+                binding.playerView.performClick();
+                return true;
+            }
+        };
         final GestureDetector gestureDetector = new GestureDetector(itemView.getContext(), videoPlayerViewGestureListener);
         binding.playerView.setOnTouchListener((v, event) -> {
             gestureDetector.onTouchEvent(event);
@@ -78,7 +61,7 @@ public class SliderVideoViewHolder extends SliderItemViewHolder {
             @Override
             public void onThumbnailClick() {
                 if (sliderCallback != null) {
-                    sliderCallback.onItemClicked(position);
+                    sliderCallback.onItemClicked(position, media, binding.getRoot());
                 }
             }
 
@@ -121,6 +104,21 @@ public class SliderVideoViewHolder extends SliderItemViewHolder {
                     sliderCallback.onPlayerRelease(position);
                 }
             }
+
+            @Override
+            public void onFullScreenModeChanged(final boolean isFullScreen, final StyledPlayerView playerView) {
+                if (sliderCallback != null) {
+                    sliderCallback.onFullScreenModeChanged(isFullScreen, playerView);
+                }
+            }
+
+            @Override
+            public boolean isInFullScreen() {
+                if (sliderCallback != null) {
+                    return sliderCallback.isInFullScreen();
+                }
+                return false;
+            }
         };
         final float aspectRatio = (float) media.getOriginalWidth() / media.getOriginalHeight();
         String videoUrl = null;
@@ -139,16 +137,10 @@ public class SliderVideoViewHolder extends SliderItemViewHolder {
                                                           aspectRatio,
                                                           ResponseBodyUtils.getThumbUrl(media),
                                                           loadVideoOnItemClick,
-                                                          controlsBinding,
                                                           videoPlayerCallback);
-        // binding.itemFeedBottom.btnMute.setOnClickListener(v -> {
-        //     final float newVol = videoPlayerViewHelper.toggleMute();
-        //     setMuteIcon(newVol);
-        //     Utils.sessionVolumeFull = newVol == 1f;
-        // });
         binding.playerView.setOnClickListener(v -> {
             if (sliderCallback != null) {
-                sliderCallback.onItemClicked(position);
+                sliderCallback.onItemClicked(position, media, binding.getRoot());
             }
         });
     }
@@ -162,62 +154,4 @@ public class SliderVideoViewHolder extends SliderItemViewHolder {
         if (videoPlayerViewHelper == null) return;
         videoPlayerViewHelper.releasePlayer();
     }
-
-    public void resetPlayerTimeline() {
-        if (videoPlayerViewHelper == null) return;
-        videoPlayerViewHelper.resetTimeline();
-    }
-
-    public void removeCallbacks() {
-        if (videoPlayerViewHelper == null) return;
-        videoPlayerViewHelper.removeCallbacks();
-    }
-
-    // private void setDimensions(final FeedModel feedModel, final int spanCount, final boolean animate) {
-    //     final ViewGroup.LayoutParams layoutParams = binding.imageViewer.getLayoutParams();
-    //     final int deviceWidth = Utils.displayMetrics.widthPixels;
-    //     final int spanWidth = deviceWidth / spanCount;
-    //     final int spanHeight = NumberUtils.getResultingHeight(spanWidth, feedModel.getImageHeight(), feedModel.getImageWidth());
-    //     final int width = spanWidth == 0 ? deviceWidth : spanWidth;
-    //     final int height = spanHeight == 0 ? deviceWidth + 1 : spanHeight;
-    //     if (animate) {
-    //         Animation animation = AnimationUtils.expand(
-    //                 binding.imageViewer,
-    //                 layoutParams.width,
-    //                 layoutParams.height,
-    //                 width,
-    //                 height,
-    //                 new Animation.AnimationListener() {
-    //                     @Override
-    //                     public void onAnimationStart(final Animation animation) {
-    //                         showOrHideDetails(spanCount);
-    //                     }
-    //
-    //                     @Override
-    //                     public void onAnimationEnd(final Animation animation) {
-    //                         // showOrHideDetails(spanCount);
-    //                     }
-    //
-    //                     @Override
-    //                     public void onAnimationRepeat(final Animation animation) {
-    //
-    //                     }
-    //                 });
-    //         binding.imageViewer.startAnimation(animation);
-    //     } else {
-    //         layoutParams.width = width;
-    //         layoutParams.height = height;
-    //         binding.imageViewer.requestLayout();
-    //     }
-    // }
-    //
-    // private void showOrHideDetails(final int spanCount) {
-    //     if (spanCount == 1) {
-    //         binding.itemFeedTop.getRoot().setVisibility(View.VISIBLE);
-    //         binding.itemFeedBottom.getRoot().setVisibility(View.VISIBLE);
-    //     } else {
-    //         binding.itemFeedTop.getRoot().setVisibility(View.GONE);
-    //         binding.itemFeedBottom.getRoot().setVisibility(View.GONE);
-    //     }
-    // }
 }
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ChildCommentViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ChildCommentViewHolder.java
deleted file mode 100644
index fd4cfb12..00000000
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ChildCommentViewHolder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package awais.instagrabber.adapters.viewholder.comments;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import awais.instagrabber.R;
-import awais.instagrabber.adapters.CommentsAdapter.CommentCallback;
-import awais.instagrabber.databinding.ItemCommentSmallBinding;
-import awais.instagrabber.models.CommentModel;
-import awais.instagrabber.repositories.responses.User;
-import awais.instagrabber.utils.Utils;
-
-public final class ChildCommentViewHolder extends RecyclerView.ViewHolder {
-
-    private final ItemCommentSmallBinding binding;
-
-    public ChildCommentViewHolder(@NonNull final ItemCommentSmallBinding binding) {
-        super(binding.getRoot());
-        this.binding = binding;
-    }
-
-    public void bind(final CommentModel comment,
-                     final boolean selected,
-                     final CommentCallback commentCallback) {
-        if (comment == null) return;
-        if (commentCallback != null) {
-            itemView.setOnClickListener(v -> commentCallback.onClick(comment));
-        }
-        if (selected) {
-            itemView.setBackgroundColor(itemView.getResources().getColor(R.color.comment_selected));
-        } else {
-            itemView.setBackgroundColor(itemView.getResources().getColor(android.R.color.transparent));
-        }
-        setupCommentText(comment, commentCallback);
-        binding.tvDate.setText(comment.getDateTime());
-        setLiked(comment.getLiked());
-        setLikes((int) comment.getLikes());
-        setUser(comment);
-    }
-
-    private void setupCommentText(final CommentModel comment, final CommentCallback commentCallback) {
-        binding.tvComment.clearOnURLClickListeners();
-        binding.tvComment.clearOnHashtagClickListeners();
-        binding.tvComment.clearOnMentionClickListeners();
-        binding.tvComment.clearOnEmailClickListeners();
-        binding.tvComment.setText(comment.getText());
-        binding.tvComment.addOnHashtagListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onHashtagClick(originalText);
-        });
-        binding.tvComment.addOnMentionClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onMentionClick(originalText);
-
-        });
-        binding.tvComment.addOnEmailClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onEmailClick(originalText);
-        });
-        binding.tvComment.addOnURLClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onURLClick(originalText);
-        });
-        binding.tvComment.setOnLongClickListener(v -> {
-            Utils.copyText(itemView.getContext(), comment.getText());
-            return true;
-        });
-        binding.tvComment.setOnClickListener(v -> commentCallback.onClick(comment));
-    }
-
-    private void setUser(final CommentModel comment) {
-        final User profileModel = comment.getProfileModel();
-        if (profileModel == null) return;
-        binding.tvUsername.setText(profileModel.getUsername());
-        binding.ivProfilePic.setImageURI(profileModel.getProfilePicUrl());
-        binding.isVerified.setVisibility(profileModel.isVerified() ? View.VISIBLE : View.GONE);
-    }
-
-    private void setLikes(final int likes) {
-        final String likesString = itemView.getResources().getQuantityString(R.plurals.likes_count, likes, likes);
-        binding.tvLikes.setText(likesString);
-    }
-
-    public final void setLiked(final boolean liked) {
-        if (liked) {
-            itemView.setBackgroundColor(itemView.getResources().getColor(R.color.comment_liked));
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ParentCommentViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ParentCommentViewHolder.java
deleted file mode 100644
index 31edac56..00000000
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/comments/ParentCommentViewHolder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package awais.instagrabber.adapters.viewholder.comments;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import awais.instagrabber.R;
-import awais.instagrabber.adapters.CommentsAdapter.CommentCallback;
-import awais.instagrabber.databinding.ItemCommentBinding;
-import awais.instagrabber.models.CommentModel;
-import awais.instagrabber.repositories.responses.User;
-import awais.instagrabber.utils.Utils;
-
-public final class ParentCommentViewHolder extends RecyclerView.ViewHolder {
-
-    private final ItemCommentBinding binding;
-
-    public ParentCommentViewHolder(@NonNull final ItemCommentBinding binding) {
-        super(binding.getRoot());
-        this.binding = binding;
-    }
-
-    public void bind(final CommentModel comment,
-                     final boolean selected,
-                     final CommentCallback commentCallback) {
-        if (comment == null) return;
-        if (commentCallback != null) {
-            itemView.setOnClickListener(v -> commentCallback.onClick(comment));
-        }
-        if (selected) {
-            itemView.setBackgroundColor(itemView.getResources().getColor(R.color.comment_selected));
-        } else {
-            itemView.setBackgroundColor(itemView.getResources().getColor(android.R.color.transparent));
-        }
-        setupCommentText(comment, commentCallback);
-        binding.tvDate.setText(comment.getDateTime());
-        setLiked(comment.getLiked());
-        setLikes((int) comment.getLikes());
-        setUser(comment);
-    }
-
-    private void setupCommentText(final CommentModel comment, final CommentCallback commentCallback) {
-        binding.tvComment.clearOnURLClickListeners();
-        binding.tvComment.clearOnHashtagClickListeners();
-        binding.tvComment.clearOnMentionClickListeners();
-        binding.tvComment.clearOnEmailClickListeners();
-        binding.tvComment.setText(comment.getText());
-        binding.tvComment.addOnHashtagListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onHashtagClick(originalText);
-        });
-        binding.tvComment.addOnMentionClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onMentionClick(originalText);
-
-        });
-        binding.tvComment.addOnEmailClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onEmailClick(originalText);
-        });
-        binding.tvComment.addOnURLClickListener(autoLinkItem -> {
-            final String originalText = autoLinkItem.getOriginalText();
-            if (commentCallback == null) return;
-            commentCallback.onURLClick(originalText);
-        });
-        binding.tvComment.setOnLongClickListener(v -> {
-            Utils.copyText(itemView.getContext(), comment.getText());
-            return true;
-        });
-        binding.tvComment.setOnClickListener(v -> commentCallback.onClick(comment));
-    }
-
-    private void setUser(final CommentModel comment) {
-        final User profileModel = comment.getProfileModel();
-        if (profileModel == null) return;
-        binding.tvUsername.setText(profileModel.getUsername());
-        binding.ivProfilePic.setImageURI(profileModel.getProfilePicUrl());
-        binding.isVerified.setVisibility(profileModel.isVerified() ? View.VISIBLE : View.GONE);
-    }
-
-    private void setLikes(final int likes) {
-        final String likesString = itemView.getResources().getQuantityString(R.plurals.likes_count, likes, likes);
-        binding.tvLikes.setText(likesString);
-    }
-
-    public final void setLiked(final boolean liked) {
-        if (liked) {
-            itemView.setBackgroundColor(itemView.getResources().getColor(R.color.comment_liked));
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemAnimatedMediaViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemAnimatedMediaViewHolder.java
index 7bc5d173..5b3b1e33 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemAnimatedMediaViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemAnimatedMediaViewHolder.java
@@ -4,7 +4,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
 import androidx.recyclerview.widget.ItemTouchHelper;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -23,6 +22,7 @@ import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemAnimatedMedia;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.Utils;
 
@@ -48,7 +48,7 @@ public class DirectItemAnimatedMediaViewHolder extends DirectItemViewHolder {
         final AnimatedMediaFixedHeight fixedHeight = images.getFixedHeight();
         if (fixedHeight == null) return;
         final String url = fixedHeight.getWebp();
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 fixedHeight.getHeight(),
                 fixedHeight.getWidth(),
                 mediaImageMaxHeight,
@@ -56,8 +56,8 @@ public class DirectItemAnimatedMediaViewHolder extends DirectItemViewHolder {
         );
         binding.ivAnimatedMessage.setVisibility(View.VISIBLE);
         final ViewGroup.LayoutParams layoutParams = binding.ivAnimatedMessage.getLayoutParams();
-        final int width = widthHeight.first != null ? widthHeight.first : 0;
-        final int height = widthHeight.second != null ? widthHeight.second : 0;
+        final int width = widthHeight.first;
+        final int height = widthHeight.second;
         layoutParams.width = width;
         layoutParams.height = height;
         binding.ivAnimatedMessage.requestLayout();
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaShareViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaShareViewHolder.java
index dddd9315..82c07ab7 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaShareViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaShareViewHolder.java
@@ -6,7 +6,6 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.util.Pair;
 import androidx.recyclerview.widget.ItemTouchHelper;
 
 import com.facebook.drawee.drawable.ScalingUtils;
@@ -31,6 +30,7 @@ import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemClip;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemFelixShare;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 import awais.instagrabber.utils.Utils;
@@ -103,15 +103,15 @@ public class DirectItemMediaShareViewHolder extends DirectItemViewHolder {
                                                   .setActualImageScaleType(ScalingUtils.ScaleType.CENTER_CROP)
                                                   .setRoundingParams(roundingParams)
                                                   .build());
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 media.getOriginalHeight(),
                 media.getOriginalWidth(),
                 mediaImageMaxHeight,
                 mediaImageMaxWidth
         );
         final ViewGroup.LayoutParams layoutParams = binding.mediaPreview.getLayoutParams();
-        layoutParams.width = widthHeight.first != null ? widthHeight.first : 0;
-        layoutParams.height = widthHeight.second != null ? widthHeight.second : 0;
+        layoutParams.width = widthHeight.first;
+        layoutParams.height = widthHeight.second;
         binding.mediaPreview.requestLayout();
         binding.mediaPreview.setTag(url);
         binding.mediaPreview.setImageURI(url);
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaViewHolder.java
index 24a9e62e..769548a8 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemMediaViewHolder.java
@@ -4,7 +4,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
 
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
@@ -14,11 +13,11 @@ import awais.instagrabber.adapters.DirectItemsAdapter.DirectItemCallback;
 import awais.instagrabber.databinding.LayoutDmBaseBinding;
 import awais.instagrabber.databinding.LayoutDmMediaBinding;
 import awais.instagrabber.models.enums.MediaItemType;
-import awais.instagrabber.repositories.responses.ImageVersions2;
 import awais.instagrabber.repositories.responses.Media;
 import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 
@@ -53,16 +52,16 @@ public class DirectItemMediaViewHolder extends DirectItemViewHolder {
         binding.typeIcon.setVisibility(modelMediaType == MediaItemType.MEDIA_TYPE_VIDEO || modelMediaType == MediaItemType.MEDIA_TYPE_SLIDER
                                        ? View.VISIBLE
                                        : View.GONE);
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 media.getOriginalHeight(),
                 media.getOriginalWidth(),
                 mediaImageMaxHeight,
                 mediaImageMaxWidth
         );
         final ViewGroup.LayoutParams layoutParams = binding.mediaPreview.getLayoutParams();
-        final int width = widthHeight.first != null ? widthHeight.first : 0;
+        final int width = widthHeight.first;
         layoutParams.width = width;
-        layoutParams.height = widthHeight.second != null ? widthHeight.second : 0;
+        layoutParams.height = widthHeight.second;
         binding.mediaPreview.requestLayout();
         binding.bgTime.getLayoutParams().width = width;
         binding.bgTime.requestLayout();
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemRavenMediaViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemRavenMediaViewHolder.java
index 6198faf1..9778d046 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemRavenMediaViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemRavenMediaViewHolder.java
@@ -4,7 +4,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
 
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
@@ -21,6 +20,7 @@ import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemVisualMedia;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 import awais.instagrabber.utils.TextUtils;
@@ -170,15 +170,15 @@ public class DirectItemRavenMediaViewHolder extends DirectItemViewHolder {
         binding.typeIcon.setVisibility(modelMediaType == MediaItemType.MEDIA_TYPE_VIDEO || modelMediaType == MediaItemType.MEDIA_TYPE_SLIDER
                                        ? View.VISIBLE
                                        : View.GONE);
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 media.getOriginalHeight(),
                 media.getOriginalWidth(),
                 mediaImageMaxHeight,
                 maxWidth
         );
         final ViewGroup.LayoutParams layoutParams = binding.preview.getLayoutParams();
-        layoutParams.width = widthHeight.first != null ? widthHeight.first : 0;
-        layoutParams.height = widthHeight.second != null ? widthHeight.second : 0;
+        layoutParams.width = widthHeight.first;
+        layoutParams.height = widthHeight.second;
         binding.preview.requestLayout();
         final String thumbUrl = ResponseBodyUtils.getThumbUrl(media);
         binding.preview.setImageURI(thumbUrl);
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemStoryShareViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemStoryShareViewHolder.java
index b6b7bf68..45a6a8d4 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemStoryShareViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemStoryShareViewHolder.java
@@ -5,7 +5,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
 import androidx.recyclerview.widget.ItemTouchHelper;
 
 import com.facebook.drawee.drawable.ScalingUtils;
@@ -17,12 +16,12 @@ import awais.instagrabber.adapters.DirectItemsAdapter.DirectItemCallback;
 import awais.instagrabber.databinding.LayoutDmBaseBinding;
 import awais.instagrabber.databinding.LayoutDmStoryShareBinding;
 import awais.instagrabber.models.enums.MediaItemType;
-import awais.instagrabber.repositories.responses.ImageVersions2;
 import awais.instagrabber.repositories.responses.Media;
 import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemStoryShare;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 import awais.instagrabber.utils.TextUtils;
@@ -76,15 +75,15 @@ public class DirectItemStoryShareViewHolder extends DirectItemViewHolder {
                                                     .setRoundingParams(roundingParams)
                                                     .setActualImageScaleType(ScalingUtils.ScaleType.CENTER_CROP)
                                                     .build());
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 storyShareMedia.getOriginalHeight(),
                 storyShareMedia.getOriginalWidth(),
                 mediaImageMaxHeight,
                 mediaImageMaxWidth
         );
         final ViewGroup.LayoutParams layoutParams = binding.ivMediaPreview.getLayoutParams();
-        layoutParams.width = widthHeight.first != null ? widthHeight.first : 0;
-        layoutParams.height = widthHeight.second != null ? widthHeight.second : 0;
+        layoutParams.width = widthHeight.first;
+        layoutParams.height = widthHeight.second;
         binding.ivMediaPreview.requestLayout();
         final String thumbUrl = ResponseBodyUtils.getThumbUrl(storyShareMedia);
         binding.ivMediaPreview.setImageURI(thumbUrl);
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemViewHolder.java
index 96476b10..61e6c5cc 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemViewHolder.java
@@ -112,6 +112,7 @@ public abstract class DirectItemViewHolder extends RecyclerView.ViewHolder imple
     }
 
     public void bind(final int position, final DirectItem item) {
+        if (item == null) return;
         this.item = item;
         messageDirection = isSelf(item) ? MessageDirection.OUTGOING : MessageDirection.INCOMING;
         // Asynchronous binding causes some weird behaviour
@@ -123,7 +124,7 @@ public abstract class DirectItemViewHolder extends RecyclerView.ViewHolder imple
         setupLongClickListener(position, messageDirection);
     }
 
-    private void bindBase(final DirectItem item, final MessageDirection messageDirection, final int position) {
+    private void bindBase(@NonNull final DirectItem item, final MessageDirection messageDirection, final int position) {
         final FrameLayout.LayoutParams containerLayoutParams = (FrameLayout.LayoutParams) binding.container.getLayoutParams();
         final DirectItemType itemType = item.getItemType();
         setMessageDirectionGravity(messageDirection, containerLayoutParams);
@@ -188,7 +189,7 @@ public abstract class DirectItemViewHolder extends RecyclerView.ViewHolder imple
         containerLayoutParams.gravity = Gravity.CENTER;
     }
 
-    private void setMessageInfo(final DirectItem item, final MessageDirection messageDirection) {
+    private void setMessageInfo(@NonNull final DirectItem item, final MessageDirection messageDirection) {
         if (showMessageInfo()) {
             binding.messageInfo.setVisibility(View.VISIBLE);
             binding.deliveryStatus.setVisibility(messageDirection == MessageDirection.OUTGOING ? View.VISIBLE : View.GONE);
@@ -550,6 +551,10 @@ public abstract class DirectItemViewHolder extends RecyclerView.ViewHolder imple
         menu.setOnDismissListener(() -> setSelected(false));
         menu.setOnReactionClickListener(emoji -> callback.onReaction(item, emoji));
         menu.setOnOptionSelectListener((itemId, cb) -> callback.onOptionSelect(item, itemId, cb));
+        menu.setOnAddReactionListener(() -> {
+            menu.dismiss();
+            itemView.postDelayed(() -> callback.onAddReactionListener(item), 300);
+        });
         menu.show(itemView, location);
     }
 
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemXmaViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemXmaViewHolder.java
index 1b1a9fda..adee0226 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemXmaViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/directmessages/DirectItemXmaViewHolder.java
@@ -4,7 +4,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
 import androidx.recyclerview.widget.ItemTouchHelper;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
@@ -16,6 +15,7 @@ import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.directmessages.DirectItem;
 import awais.instagrabber.repositories.responses.directmessages.DirectItemXma;
 import awais.instagrabber.repositories.responses.directmessages.DirectThread;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 
 public class DirectItemXmaViewHolder extends DirectItemViewHolder {
@@ -43,7 +43,7 @@ public class DirectItemXmaViewHolder extends DirectItemViewHolder {
         }
         final DirectItemXma.XmaUrlInfo urlInfo = playableUrlInfo != null ? playableUrlInfo : previewUrlInfo;
         final String url = urlInfo.getUrl();
-        final Pair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(
                 urlInfo.getHeight(),
                 urlInfo.getWidth(),
                 mediaImageMaxHeight,
@@ -51,8 +51,8 @@ public class DirectItemXmaViewHolder extends DirectItemViewHolder {
         );
         binding.ivAnimatedMessage.setVisibility(View.VISIBLE);
         final ViewGroup.LayoutParams layoutParams = binding.ivAnimatedMessage.getLayoutParams();
-        final int width = widthHeight.first != null ? widthHeight.first : 0;
-        final int height = widthHeight.second != null ? widthHeight.second : 0;
+        final int width = widthHeight.first;
+        final int height = widthHeight.second;
         layoutParams.width = width;
         layoutParams.height = height;
         binding.ivAnimatedMessage.requestLayout();
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedItemViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedItemViewHolder.java
index 860bd027..042264c9 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedItemViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedItemViewHolder.java
@@ -55,7 +55,7 @@ public abstract class FeedItemViewHolder extends RecyclerView.ViewHolder {
     private void setupComments(@NonNull final Media feedModel) {
         final long commentsCount = feedModel.getCommentCount();
         bottomBinding.commentsCount.setText(String.valueOf(commentsCount));
-        bottomBinding.commentsCount.setOnClickListener(v -> feedItemCallback.onCommentsClick(feedModel));
+        bottomBinding.btnComments.setOnClickListener(v -> feedItemCallback.onCommentsClick(feedModel));
     }
 
     private void setupProfilePic(@NonNull final Media media) {
@@ -75,6 +75,7 @@ public abstract class FeedItemViewHolder extends RecyclerView.ViewHolder {
         // final SpannableString spannableString = new SpannableString();
         // spannableString.setSpan(new CommentMentionClickSpan(), 0, titleLen, 0);
         final User user = media.getUser();
+        if (user == null) return;
         final String title = "@" + user.getUsername();
         topBinding.title.setText(title);
         topBinding.title.setOnClickListener(v -> feedItemCallback.onNameClick(media, topBinding.ivProfilePic));
@@ -120,8 +121,7 @@ public abstract class FeedItemViewHolder extends RecyclerView.ViewHolder {
             topBinding.title.setLayoutParams(new RelativeLayout.LayoutParams(
                     RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT
             ));
-        }
-        else {
+        } else {
             final String locationName = location.getName();
             if (TextUtils.isEmpty(locationName)) {
                 topBinding.location.setVisibility(View.GONE);
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java
index b9271d6f..6931c851 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedSliderViewHolder.java
@@ -45,9 +45,9 @@ public class FeedSliderViewHolder extends FeedItemViewHolder {
         final String text = "1/" + sliderItemLen;
         binding.mediaCounter.setText(text);
         binding.mediaList.setOffscreenPageLimit(1);
-        final SliderItemsAdapter adapter = new SliderItemsAdapter(null, null, false, new SliderCallbackAdapter() {
+        final SliderItemsAdapter adapter = new SliderItemsAdapter(false, new SliderCallbackAdapter() {
             @Override
-            public void onItemClicked(final int position) {
+            public void onItemClicked(final int position, final Media media, final View view) {
                 feedItemCallback.onSliderClick(feedModel, position);
             }
         });
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java
index 33ae8757..3d56551b 100644
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/feed/FeedVideoViewHolder.java
@@ -97,7 +97,7 @@ public class FeedVideoViewHolder extends FeedItemViewHolder {
                                                                                       aspectRatio,
                                                                                       ResponseBodyUtils.getThumbUrl(media),
                                                                                       false,
-                                                                                      null,
+                                                                                      // null,
                                                                                       videoPlayerCallback);
         binding.videoPost.thumbnail.post(() -> {
             if (media.getOriginalHeight() > 0.8 * Utils.displayMetrics.heightPixels) {
diff --git a/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java b/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
deleted file mode 100755
index b75b758c..00000000
--- a/app/src/main/java/awais/instagrabber/asyncs/CommentsFetcher.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package awais.instagrabber.asyncs;
-
-import android.os.AsyncTask;
-import android.util.Log;
-import android.util.Pair;
-
-import androidx.annotation.NonNull;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import awais.instagrabber.BuildConfig;
-import awais.instagrabber.interfaces.FetchListener;
-import awais.instagrabber.models.CommentModel;
-import awais.instagrabber.repositories.responses.FriendshipStatus;
-import awais.instagrabber.repositories.responses.User;
-import awais.instagrabber.utils.Constants;
-import awais.instagrabber.utils.NetworkUtils;
-import awais.instagrabber.utils.TextUtils;
-//import awaisomereport.LogCollector;
-
-//import static awais.instagrabber.utils.Utils.logCollector;
-
-public final class CommentsFetcher extends AsyncTask<Void, Void, List<CommentModel>> {
-    private static final String TAG = "CommentsFetcher";
-
-    private final String shortCode, endCursor;
-    private final FetchListener<List<CommentModel>> fetchListener;
-
-    public CommentsFetcher(final String shortCode, final String endCursor, final FetchListener<List<CommentModel>> fetchListener) {
-        this.shortCode = shortCode;
-        this.endCursor = endCursor;
-        this.fetchListener = fetchListener;
-    }
-
-    @NonNull
-    @Override
-    protected List<CommentModel> doInBackground(final Void... voids) {
-         /*
-        "https://www.instagram.com/graphql/query/?query_hash=97b41c52301f77ce508f55e66d17620e&variables=" + "{\"shortcode\":\"" + shortcode + "\",\"first\":50,\"after\":\"" + endCursor + "\"}";
-
-        97b41c52301f77ce508f55e66d17620e -> for comments
-        51fdd02b67508306ad4484ff574a0b62 -> for child comments
-
-        https://www.instagram.com/graphql/query/?query_hash=51fdd02b67508306ad4484ff574a0b62&variables={"comment_id":"18100041898085322","first":50,"after":""}
-         */
-        final List<CommentModel> commentModels = getParentComments();
-        if (commentModels != null) {
-            for (final CommentModel commentModel : commentModels) {
-                final List<CommentModel> childCommentModels = commentModel.getChildCommentModels();
-                if (childCommentModels != null) {
-                    final int childCommentsLen = childCommentModels.size();
-                    final CommentModel lastChild = childCommentModels.get(childCommentsLen - 1);
-                    if (lastChild != null && lastChild.hasNextPage() && !TextUtils.isEmpty(lastChild.getEndCursor())) {
-                        final List<CommentModel> remoteChildComments = getChildComments(commentModel.getId());
-                        commentModel.setChildCommentModels(remoteChildComments);
-                        lastChild.setPageCursor(false, null);
-                    }
-                }
-            }
-        }
-        return commentModels;
-    }
-
-    @Override
-    protected void onPreExecute() {
-        if (fetchListener != null) fetchListener.doBefore();
-    }
-
-    @Override
-    protected void onPostExecute(final List<CommentModel> result) {
-        if (fetchListener != null) fetchListener.onResult(result);
-    }
-
-    @NonNull
-    private synchronized List<CommentModel> getChildComments(final String commentId) {
-        final List<CommentModel> commentModels = new ArrayList<>();
-        String childEndCursor = "";
-        while (childEndCursor != null) {
-            final String url = "https://www.instagram.com/graphql/query/?query_hash=51fdd02b67508306ad4484ff574a0b62&variables=" +
-                    "{\"comment_id\":\"" + commentId + "\",\"first\":50,\"after\":\"" + childEndCursor + "\"}";
-            try {
-                final HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
-                conn.setUseCaches(false);
-                conn.connect();
-
-                if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) break;
-                else {
-                    final JSONObject data = new JSONObject(NetworkUtils.readFromConnection(conn)).getJSONObject("data")
-                                                                                                 .getJSONObject("comment")
-                                                                                                 .getJSONObject("edge_threaded_comments");
-
-                    final JSONObject pageInfo = data.getJSONObject("page_info");
-                    childEndCursor = pageInfo.getString("end_cursor");
-                    if (TextUtils.isEmpty(childEndCursor)) childEndCursor = null;
-
-                    final JSONArray childComments = data.optJSONArray("edges");
-                    if (childComments != null) {
-                        final int length = childComments.length();
-                        for (int i = 0; i < length; ++i) {
-                            final JSONObject childComment = childComments.getJSONObject(i).optJSONObject("node");
-
-                            if (childComment != null) {
-                                final JSONObject owner = childComment.getJSONObject("owner");
-                                final User user = new User(
-                                        owner.optLong(Constants.EXTRAS_ID, 0),
-                                        owner.getString(Constants.EXTRAS_USERNAME),
-                                        null,
-                                        false,
-                                        owner.getString("profile_pic_url"),
-                                        null,
-                                        new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
-                                        false, false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null, null,
-                                        null, null, null);
-                                final JSONObject likedBy = childComment.optJSONObject("edge_liked_by");
-                                commentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),
-                                                                   childComment.getString("text"),
-                                                                   childComment.getLong("created_at"),
-                                                                   likedBy != null ? likedBy.optLong("count", 0) : 0,
-                                                                   childComment.getBoolean("viewer_has_liked"),
-                                                                   user));
-                            }
-                        }
-                    }
-                }
-                conn.disconnect();
-            } catch (final Exception e) {
-//                if (logCollector != null)
-//                    logCollector.appendException(e,
-//                                                 LogCollector.LogFile.ASYNC_COMMENTS_FETCHER,
-//                                                 "getChildComments",
-//                                                 new Pair<>("commentModels.size", commentModels.size()));
-                if (BuildConfig.DEBUG) Log.e(TAG, "", e);
-                if (fetchListener != null) fetchListener.onFailure(e);
-                break;
-            }
-        }
-
-        return commentModels;
-    }
-
-    @NonNull
-    private synchronized List<CommentModel> getParentComments() {
-        final List<CommentModel> commentModels = new ArrayList<>();
-        final String url = "https://www.instagram.com/graphql/query/?query_hash=bc3296d1ce80a24b1b6e40b1e72903f5&variables=" +
-                "{\"shortcode\":\"" + shortCode + "\",\"first\":50,\"after\":\"" + endCursor.replace("\"", "\\\"") + "\"}";
-        try {
-            final HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
-            conn.setUseCaches(false);
-            conn.connect();
-
-            if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) return null;
-            else {
-                final JSONObject parentComments = new JSONObject(NetworkUtils.readFromConnection(conn)).getJSONObject("data")
-                                                                                                       .getJSONObject("shortcode_media")
-                                                                                                       .getJSONObject(
-                                                                                                               "edge_media_to_parent_comment");
-
-                final JSONObject pageInfo = parentComments.getJSONObject("page_info");
-                final String foundEndCursor = pageInfo.optString("end_cursor");
-                final boolean hasNextPage = pageInfo.optBoolean("has_next_page", !TextUtils.isEmpty(foundEndCursor));
-
-                // final boolean containsToken = endCursor.contains("bifilter_token");
-                // if (!Utils.isEmpty(endCursor) && (containsToken || endCursor.contains("cached_comments_cursor"))) {
-                //     final JSONObject endCursorObject = new JSONObject(endCursor);
-                //     endCursor = endCursorObject.optString("cached_comments_cursor");
-                //
-                //     if (!Utils.isEmpty(endCursor))
-                //         endCursor = "{\\\"cached_comments_cursor\\\": \\\"" + endCursor + "\\\", ";
-                //     else
-                //         endCursor = "{";
-                //
-                //     endCursor = endCursor + "\\\"bifilter_token\\\": \\\"" + endCursorObject.getString("bifilter_token") + "\\\"}";
-                // }
-                // else if (containsToken) endCursor = null;
-
-                final JSONArray comments = parentComments.getJSONArray("edges");
-                final int commentsLen = comments.length();
-                for (int i = 0; i < commentsLen; ++i) {
-                    final JSONObject comment = comments.getJSONObject(i).getJSONObject("node");
-
-                    final JSONObject owner = comment.getJSONObject("owner");
-                    final User user = new User(
-                            owner.optLong(Constants.EXTRAS_ID, 0),
-                            owner.getString(Constants.EXTRAS_USERNAME),
-                            null,
-                            false,
-                            owner.getString("profile_pic_url"),
-                            null,
-                            new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
-                            owner.optBoolean("is_verified"),
-                            false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null, null, null,
-                            null, null);
-                    final JSONObject likedBy = comment.optJSONObject("edge_liked_by");
-                    final String commentId = comment.getString(Constants.EXTRAS_ID);
-                    final CommentModel commentModel = new CommentModel(commentId,
-                                                                       comment.getString("text"),
-                                                                       comment.getLong("created_at"),
-                                                                       likedBy != null ? likedBy.optLong("count", 0) : 0,
-                                                                       comment.getBoolean("viewer_has_liked"),
-                                                                       user);
-                    if (i == 0 && !foundEndCursor.contains("tao_cursor"))
-                        commentModel.setPageCursor(hasNextPage, TextUtils.isEmpty(foundEndCursor) ? null : foundEndCursor);
-                    JSONObject tempJsonObject;
-                    final JSONArray childCommentsArray;
-                    final int childCommentsLen;
-                    if ((tempJsonObject = comment.optJSONObject("edge_threaded_comments")) != null &&
-                            (childCommentsArray = tempJsonObject.optJSONArray("edges")) != null
-                            && (childCommentsLen = childCommentsArray.length()) > 0) {
-
-                        final String childEndCursor;
-                        final boolean childHasNextPage;
-                        if ((tempJsonObject = tempJsonObject.optJSONObject("page_info")) != null) {
-                            childEndCursor = tempJsonObject.optString("end_cursor");
-                            childHasNextPage = tempJsonObject.optBoolean("has_next_page", !TextUtils.isEmpty(childEndCursor));
-                        } else {
-                            childEndCursor = null;
-                            childHasNextPage = false;
-                        }
-
-                        final List<CommentModel> childCommentModels = new ArrayList<>();
-                        for (int j = 0; j < childCommentsLen; ++j) {
-                            final JSONObject childComment = childCommentsArray.getJSONObject(j).getJSONObject("node");
-
-                            tempJsonObject = childComment.getJSONObject("owner");
-                            final User childUser = new User(
-                                    tempJsonObject.optLong(Constants.EXTRAS_ID, 0),
-                                    tempJsonObject.getString(Constants.EXTRAS_USERNAME),
-                                    null,
-                                    false,
-                                    tempJsonObject.getString("profile_pic_url"),
-                                    null,
-                                    new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
-                                    tempJsonObject.optBoolean("is_verified"), false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0,
-                                    null, null, null, null, null, null);
-
-                            tempJsonObject = childComment.optJSONObject("edge_liked_by");
-                            childCommentModels.add(new CommentModel(childComment.getString(Constants.EXTRAS_ID),
-                                                                    childComment.getString("text"),
-                                                                    childComment.getLong("created_at"),
-                                                                    tempJsonObject != null ? tempJsonObject.optLong("count", 0) : 0,
-                                                                    childComment.getBoolean("viewer_has_liked"),
-                                                                    childUser));
-                        }
-                        childCommentModels.get(childCommentsLen - 1).setPageCursor(childHasNextPage, childEndCursor);
-                        commentModel.setChildCommentModels(childCommentModels);
-                    }
-                    commentModels.add(commentModel);
-                }
-            }
-
-            conn.disconnect();
-        } catch (final Exception e) {
-//            if (logCollector != null)
-//                logCollector.appendException(e, LogCollector.LogFile.ASYNC_COMMENTS_FETCHER, "getParentComments",
-//                                             new Pair<>("commentModelsList.size", commentModels.size()));
-            if (BuildConfig.DEBUG) Log.e("AWAISKING_APP", "", e);
-            if (fetchListener != null) fetchListener.onFailure(e);
-            return null;
-        }
-        return commentModels;
-    }
-}
diff --git a/app/src/main/java/awais/instagrabber/asyncs/PostFetcher.java b/app/src/main/java/awais/instagrabber/asyncs/PostFetcher.java
index ddd670f1..c0e63ea6 100755
--- a/app/src/main/java/awais/instagrabber/asyncs/PostFetcher.java
+++ b/app/src/main/java/awais/instagrabber/asyncs/PostFetcher.java
@@ -12,9 +12,6 @@ import awais.instagrabber.interfaces.FetchListener;
 import awais.instagrabber.repositories.responses.Media;
 import awais.instagrabber.utils.NetworkUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
-//import awaisomereport.LogCollector;
-
-//import static awais.instagrabber.utils.Utils.logCollector;
 
 public final class PostFetcher extends AsyncTask<Void, Void, Media> {
     private static final String TAG = "PostFetcher";
@@ -136,9 +133,9 @@ public final class PostFetcher extends AsyncTask<Void, Void, Media> {
                 return ResponseBodyUtils.parseGraphQLItem(media, null);
             }
         } catch (Exception e) {
-//            if (logCollector != null) {
-//                logCollector.appendException(e, LogCollector.LogFile.ASYNC_POST_FETCHER, "doInBackground");
-//            }
+            // if (logCollector != null) {
+            //     logCollector.appendException(e, LogCollector.LogFile.ASYNC_POST_FETCHER, "doInBackground");
+            // }
             Log.e(TAG, "Error fetching post", e);
         } finally {
             if (conn != null) {
diff --git a/app/src/main/java/awais/instagrabber/customviews/FormattedNumberTextView.java b/app/src/main/java/awais/instagrabber/customviews/FormattedNumberTextView.java
new file mode 100644
index 00000000..99c2a216
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/FormattedNumberTextView.java
@@ -0,0 +1,165 @@
+package awais.instagrabber.customviews;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.transition.ChangeBounds;
+import androidx.transition.Transition;
+import androidx.transition.TransitionManager;
+import androidx.transition.TransitionSet;
+
+import java.time.Duration;
+
+import awais.instagrabber.customviews.helpers.ChangeText;
+import awais.instagrabber.utils.NumberUtils;
+
+public class FormattedNumberTextView extends AppCompatTextView {
+    private static final String TAG = FormattedNumberTextView.class.getSimpleName();
+    private static final Transition TRANSITION;
+
+    private long number = Long.MIN_VALUE;
+    private boolean showAbbreviation = true;
+    private boolean animateChanges = false;
+    private boolean toggleOnClick = true;
+    private boolean autoToggleToAbbreviation = true;
+    private long autoToggleTimeoutMs = Duration.ofSeconds(2).toMillis();
+    private boolean initDone = false;
+
+    static {
+        final TransitionSet transitionSet = new TransitionSet();
+        final ChangeText changeText = new ChangeText().setChangeBehavior(ChangeText.CHANGE_BEHAVIOR_OUT_IN);
+        transitionSet.addTransition(changeText).addTransition(new ChangeBounds());
+        TRANSITION = transitionSet;
+    }
+
+
+    public FormattedNumberTextView(@NonNull final Context context) {
+        super(context);
+        init();
+    }
+
+    public FormattedNumberTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FormattedNumberTextView(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        if (initDone) return;
+        setupClickToggle();
+        initDone = true;
+    }
+
+    private void setupClickToggle() {
+        setOnClickListener(null);
+    }
+
+    private OnClickListener getWrappedClickListener(@Nullable final OnClickListener l) {
+        if (!toggleOnClick) {
+            return l;
+        }
+        return v -> {
+            toggleAbbreviation();
+            if (l != null) {
+                l.onClick(this);
+            }
+        };
+    }
+
+    public void setNumber(final long number) {
+        if (this.number == number) return;
+        this.number = number;
+        format();
+    }
+
+    public void clearNumber() {
+        if (number == Long.MIN_VALUE) return;
+        number = Long.MIN_VALUE;
+        format();
+    }
+
+    public void setShowAbbreviation(final boolean showAbbreviation) {
+        if (this.showAbbreviation && showAbbreviation) return;
+        this.showAbbreviation = showAbbreviation;
+        format();
+    }
+
+    public boolean isShowAbbreviation() {
+        return showAbbreviation;
+    }
+
+    private void toggleAbbreviation() {
+        if (number == Long.MIN_VALUE) return;
+        setShowAbbreviation(!showAbbreviation);
+    }
+
+    public void setToggleOnClick(final boolean toggleOnClick) {
+        this.toggleOnClick = toggleOnClick;
+    }
+
+    public boolean isToggleOnClick() {
+        return toggleOnClick;
+    }
+
+    public void setAutoToggleToAbbreviation(final boolean autoToggleToAbbreviation) {
+        this.autoToggleToAbbreviation = autoToggleToAbbreviation;
+    }
+
+    public boolean isAutoToggleToAbbreviation() {
+        return autoToggleToAbbreviation;
+    }
+
+    public void setAutoToggleTimeoutMs(final long autoToggleTimeoutMs) {
+        this.autoToggleTimeoutMs = autoToggleTimeoutMs;
+    }
+
+    public long getAutoToggleTimeoutMs() {
+        return autoToggleTimeoutMs;
+    }
+
+    public void setAnimateChanges(final boolean animateChanges) {
+        this.animateChanges = animateChanges;
+    }
+
+    public boolean isAnimateChanges() {
+        return animateChanges;
+    }
+
+    @Override
+    public void setOnClickListener(@Nullable final OnClickListener l) {
+        super.setOnClickListener(getWrappedClickListener(l));
+    }
+
+    private void format() {
+        post(() -> {
+            if (animateChanges) {
+                try {
+                    TransitionManager.beginDelayedTransition((ViewGroup) getParent(), TRANSITION);
+                } catch (Exception e) {
+                    Log.e(TAG, "format: ", e);
+                }
+            }
+            if (number == Long.MIN_VALUE) {
+                setText(null);
+                return;
+            }
+            if (showAbbreviation) {
+                setText(NumberUtils.abbreviate(number));
+                return;
+            }
+            setText(String.valueOf(number));
+            if (autoToggleToAbbreviation) {
+                getHandler().postDelayed(() -> setShowAbbreviation(true), autoToggleTimeoutMs);
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/FragmentNavigatorWithDefaultAnimations.java b/app/src/main/java/awais/instagrabber/customviews/FragmentNavigatorWithDefaultAnimations.java
new file mode 100644
index 00000000..358e34d8
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/FragmentNavigatorWithDefaultAnimations.java
@@ -0,0 +1,75 @@
+package awais.instagrabber.customviews;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.navigation.NavDestination;
+import androidx.navigation.NavOptions;
+import androidx.navigation.Navigator;
+import androidx.navigation.fragment.FragmentNavigator;
+
+import awais.instagrabber.R;
+
+@Navigator.Name("fragment")
+public class FragmentNavigatorWithDefaultAnimations extends FragmentNavigator {
+
+    private final NavOptions emptyNavOptions = new NavOptions.Builder().build();
+    // private final NavOptions defaultNavOptions = new NavOptions.Builder()
+    //         .setEnterAnim(R.animator.nav_default_enter_anim)
+    //         .setExitAnim(R.animator.nav_default_exit_anim)
+    //         .setPopEnterAnim(R.animator.nav_default_pop_enter_anim)
+    //         .setPopExitAnim(R.animator.nav_default_pop_exit_anim)
+    //         .build();
+
+    private final NavOptions defaultNavOptions = new NavOptions.Builder()
+            .setEnterAnim(R.anim.slide_in_right)
+            .setExitAnim(R.anim.slide_out_left)
+            .setPopEnterAnim(android.R.anim.slide_in_left)
+            .setPopExitAnim(android.R.anim.slide_out_right)
+            .build();
+
+    public FragmentNavigatorWithDefaultAnimations(@NonNull final Context context,
+                                                  @NonNull final FragmentManager manager,
+                                                  final int containerId) {
+        super(context, manager, containerId);
+    }
+
+    @Nullable
+    @Override
+    public NavDestination navigate(@NonNull final Destination destination,
+                                   @Nullable final Bundle args,
+                                   @Nullable final NavOptions navOptions,
+                                   @Nullable final Navigator.Extras navigatorExtras) {
+        // this will try to fill in empty animations with defaults when no shared element transitions are set
+        // https://developer.android.com/guide/navigation/navigation-animate-transitions#shared-element
+        final boolean shouldUseTransitionsInstead = navigatorExtras != null;
+        final NavOptions navOptions1 = shouldUseTransitionsInstead ? navOptions : fillEmptyAnimationsWithDefaults(navOptions);
+        return super.navigate(destination, args, navOptions1, navigatorExtras);
+    }
+
+    private NavOptions fillEmptyAnimationsWithDefaults(@Nullable final NavOptions navOptions) {
+        if (navOptions == null) {
+            return defaultNavOptions;
+        }
+        return copyNavOptionsWithDefaultAnimations(navOptions);
+    }
+
+    @NonNull
+    private NavOptions copyNavOptionsWithDefaultAnimations(@NonNull final NavOptions navOptions) {
+        return new NavOptions.Builder()
+                .setLaunchSingleTop(navOptions.shouldLaunchSingleTop())
+                .setPopUpTo(navOptions.getPopUpTo(), navOptions.isPopUpToInclusive())
+                .setEnterAnim(navOptions.getEnterAnim() == emptyNavOptions.getEnterAnim()
+                              ? defaultNavOptions.getEnterAnim() : navOptions.getEnterAnim())
+                .setExitAnim(navOptions.getExitAnim() == emptyNavOptions.getExitAnim()
+                             ? defaultNavOptions.getExitAnim() : navOptions.getExitAnim())
+                .setPopEnterAnim(navOptions.getPopEnterAnim() == emptyNavOptions.getPopEnterAnim()
+                                 ? defaultNavOptions.getPopEnterAnim() : navOptions.getPopEnterAnim())
+                .setPopExitAnim(navOptions.getPopExitAnim() == emptyNavOptions.getPopExitAnim()
+                                ? defaultNavOptions.getPopExitAnim() : navOptions.getPopExitAnim())
+                .build();
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/NavHostFragmentWithDefaultAnimations.java b/app/src/main/java/awais/instagrabber/customviews/NavHostFragmentWithDefaultAnimations.java
new file mode 100644
index 00000000..11621a6c
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/NavHostFragmentWithDefaultAnimations.java
@@ -0,0 +1,60 @@
+package awais.instagrabber.customviews;
+
+import android.os.Bundle;
+
+import androidx.annotation.NavigationRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.navigation.NavController;
+import androidx.navigation.Navigator;
+import androidx.navigation.fragment.FragmentNavigator;
+import androidx.navigation.fragment.NavHostFragment;
+
+public class NavHostFragmentWithDefaultAnimations extends NavHostFragment {
+    private static final String KEY_GRAPH_ID = "android-support-nav:fragment:graphId";
+    private static final String KEY_START_DESTINATION_ARGS =
+            "android-support-nav:fragment:startDestinationArgs";
+    private static final String KEY_NAV_CONTROLLER_STATE =
+            "android-support-nav:fragment:navControllerState";
+    private static final String KEY_DEFAULT_NAV_HOST = "android-support-nav:fragment:defaultHost";
+
+    @NonNull
+    public static NavHostFragment create(@NavigationRes int graphResId) {
+        return create(graphResId, null);
+    }
+
+    @NonNull
+    public static NavHostFragment create(@NavigationRes int graphResId,
+                                         @Nullable Bundle startDestinationArgs) {
+        Bundle b = null;
+        if (graphResId != 0) {
+            b = new Bundle();
+            b.putInt(KEY_GRAPH_ID, graphResId);
+        }
+        if (startDestinationArgs != null) {
+            if (b == null) {
+                b = new Bundle();
+            }
+            b.putBundle(KEY_START_DESTINATION_ARGS, startDestinationArgs);
+        }
+
+        final NavHostFragmentWithDefaultAnimations result = new NavHostFragmentWithDefaultAnimations();
+        if (b != null) {
+            result.setArguments(b);
+        }
+        return result;
+    }
+
+    @NonNull
+    @Override
+    protected Navigator<? extends FragmentNavigator.Destination> createFragmentNavigator() {
+        return new FragmentNavigatorWithDefaultAnimations(requireContext(), getChildFragmentManager(), getId());
+    }
+
+    @Override
+    protected void onCreateNavController(@NonNull final NavController navController) {
+        super.onCreateNavController(navController);
+        navController.getNavigatorProvider()
+                     .addNavigator(new FragmentNavigatorWithDefaultAnimations(requireContext(), getChildFragmentManager(), getId()));
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java b/app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java
index b2456e0a..2e008a18 100644
--- a/app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java
+++ b/app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java
@@ -3,6 +3,8 @@ package awais.instagrabber.customviews;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -25,6 +27,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 
 import awais.instagrabber.adapters.FeedAdapterV2;
 import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration;
@@ -60,14 +63,17 @@ public class PostsRecyclerView extends RecyclerView {
     private FeedAdapterV2.FeedItemCallback feedItemCallback;
     private boolean shouldScrollToTop;
     private FeedAdapterV2.SelectionModeCallback selectionModeCallback;
+    private Function<ViewGroup, View> headerViewCreator;
+    private Function<View, Void> headerBinder;
+    private boolean refresh = true;
 
     private final List<FetchStatusChangeListener> fetchStatusChangeListeners = new ArrayList<>();
 
     private final FetchListener<List<Media>> fetchListener = new FetchListener<List<Media>>() {
         @Override
         public void onResult(final List<Media> result) {
-            final int currentPage = lazyLoader.getCurrentPage();
-            if (currentPage == 0) {
+            if (refresh) {
+                refresh = false;
                 mediaViewModel.getList().postValue(result);
                 shouldScrollToTop = true;
                 dispatchFetchStatus();
@@ -192,22 +198,25 @@ public class PostsRecyclerView extends RecyclerView {
     }
 
     private void initSelf() {
-        mediaViewModel = new ViewModelProvider(viewModelStoreOwner).get(MediaViewModel.class);
-        mediaViewModel.getList().observe(lifeCycleOwner, list -> {
-            if (list.size() <= 0) return;
-            feedAdapter.submitList(list, () -> {
-                // postDelayed(this::fetchMoreIfPossible, 1000);
-                if (!shouldScrollToTop) return;
-                smoothScrollToPosition(0);
-                shouldScrollToTop = false;
-            });
-        });
+        try {
+            mediaViewModel = new ViewModelProvider(viewModelStoreOwner).get(MediaViewModel.class);
+        } catch (Exception e) {
+            Log.e(TAG, "initSelf: ", e);
+        }
+        if (mediaViewModel == null) return;
+        mediaViewModel.getList().observe(lifeCycleOwner, list -> feedAdapter.submitList(list, () -> {
+            // postDelayed(this::fetchMoreIfPossible, 1000);
+            if (!shouldScrollToTop) return;
+            shouldScrollToTop = false;
+            post(() -> smoothScrollToPosition(0));
+        }));
         postFetcher = new PostFetcher(postFetchService, fetchListener);
         if (layoutPreferences.getHasGap()) {
             addItemDecoration(gridSpacingItemDecoration);
         }
         setHasFixedSize(true);
         setNestedScrollingEnabled(true);
+        setItemAnimator(null);
         lazyLoader = new RecyclerLazyLoaderAtEdge(layoutManager, (page) -> {
             if (postFetcher.hasMore()) {
                 postFetcher.fetch();
@@ -311,11 +320,12 @@ public class PostsRecyclerView extends RecyclerView {
     }
 
     public void refresh() {
+        refresh = true;
         if (lazyLoader != null) {
             lazyLoader.resetState();
         }
         if (postFetcher != null) {
-            mediaViewModel.getList().postValue(Collections.emptyList());
+            // mediaViewModel.getList().postValue(Collections.emptyList());
             postFetcher.reset();
             postFetcher.fetch();
         }
diff --git a/app/src/main/java/awais/instagrabber/customviews/ProfilePicView.java b/app/src/main/java/awais/instagrabber/customviews/ProfilePicView.java
index 2f8409de..491127a6 100644
--- a/app/src/main/java/awais/instagrabber/customviews/ProfilePicView.java
+++ b/app/src/main/java/awais/instagrabber/customviews/ProfilePicView.java
@@ -70,6 +70,9 @@ public final class ProfilePicView extends CircularImageView {
             case SMALL:
                 dimenRes = R.dimen.profile_pic_size_small;
                 break;
+            case SMALLER:
+                dimenRes = R.dimen.profile_pic_size_smaller;
+                break;
             case TINY:
                 dimenRes = R.dimen.profile_pic_size_tiny;
                 break;
@@ -113,7 +116,8 @@ public final class ProfilePicView extends CircularImageView {
         TINY(0),
         SMALL(1),
         REGULAR(2),
-        LARGE(3);
+        LARGE(3),
+        SMALLER(4);
 
         private final int value;
         private static final Map<Integer, Size> map = new HashMap<>();
diff --git a/app/src/main/java/awais/instagrabber/customviews/RamboTextViewV2.java b/app/src/main/java/awais/instagrabber/customviews/RamboTextViewV2.java
index 14f09798..a96766af 100644
--- a/app/src/main/java/awais/instagrabber/customviews/RamboTextViewV2.java
+++ b/app/src/main/java/awais/instagrabber/customviews/RamboTextViewV2.java
@@ -1,10 +1,12 @@
 package awais.instagrabber.customviews;
 
 import android.content.Context;
+import android.text.InputFilter;
 import android.util.AttributeSet;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.emoji.widget.EmojiTextViewHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,6 +25,8 @@ public class RamboTextViewV2 extends AutoLinkTextView {
     private final List<OnURLClickListener> onURLClickListeners = new ArrayList<>();
     private final List<OnEmailClickListener> onEmailClickListeners = new ArrayList<>();
 
+    private EmojiTextViewHelper emojiTextViewHelper;
+
     public RamboTextViewV2(@NonNull final Context context,
                            @Nullable final AttributeSet attrs) {
         super(context, attrs);
@@ -30,6 +34,7 @@ public class RamboTextViewV2 extends AutoLinkTextView {
     }
 
     private void init() {
+        getEmojiTextViewHelper().updateTransformationMethod();
         addAutoLinkMode(MODE_HASHTAG.INSTANCE, MODE_MENTION.INSTANCE, MODE_EMAIL.INSTANCE, MODE_URL.INSTANCE);
         onAutoLinkClick(autoLinkItem -> {
             final Mode mode = autoLinkItem.getMode();
@@ -57,6 +62,26 @@ public class RamboTextViewV2 extends AutoLinkTextView {
                 }
             }
         });
+        onAutoLinkLongClick(autoLinkItem -> {});
+    }
+
+    @Override
+    public void setFilters(InputFilter[] filters) {
+        super.setFilters(getEmojiTextViewHelper().getFilters(filters));
+    }
+
+    @Override
+    public void setAllCaps(boolean allCaps) {
+        super.setAllCaps(allCaps);
+        getEmojiTextViewHelper().setAllCaps(allCaps);
+    }
+
+
+    private EmojiTextViewHelper getEmojiTextViewHelper() {
+        if (emojiTextViewHelper == null) {
+            emojiTextViewHelper = new EmojiTextViewHelper(this);
+        }
+        return emojiTextViewHelper;
     }
 
     public void addOnMentionClickListener(final OnMentionClickListener onMentionClickListener) {
diff --git a/app/src/main/java/awais/instagrabber/customviews/TextViewDrawableSize.java b/app/src/main/java/awais/instagrabber/customviews/TextViewDrawableSize.java
new file mode 100644
index 00000000..d4c96b8c
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/TextViewDrawableSize.java
@@ -0,0 +1,95 @@
+package awais.instagrabber.customviews;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.emoji.widget.EmojiAppCompatTextView;
+
+import awais.instagrabber.R;
+
+/**
+ * https://stackoverflow.com/a/31916731
+ */
+public class TextViewDrawableSize extends EmojiAppCompatTextView {
+
+    private int mDrawableWidth;
+    private int mDrawableHeight;
+    private boolean calledFromInit = false;
+
+    public TextViewDrawableSize(final Context context) {
+        this(context, null);
+    }
+
+    public TextViewDrawableSize(final Context context, final AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TextViewDrawableSize(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(@NonNull final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        final TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.TextViewDrawableSize, defStyleAttr, 0);
+
+        try {
+            mDrawableWidth = array.getDimensionPixelSize(R.styleable.TextViewDrawableSize_compoundDrawableWidth, -1);
+            mDrawableHeight = array.getDimensionPixelSize(R.styleable.TextViewDrawableSize_compoundDrawableHeight, -1);
+        } finally {
+            array.recycle();
+        }
+
+        if (mDrawableWidth > 0 || mDrawableHeight > 0) {
+            initCompoundDrawableSize();
+        }
+    }
+
+    private void initCompoundDrawableSize() {
+        final Drawable[] drawables = getCompoundDrawablesRelative();
+        for (Drawable drawable : drawables) {
+            if (drawable == null) {
+                continue;
+            }
+
+            final Rect realBounds = drawable.getBounds();
+            float scaleFactor = drawable.getIntrinsicHeight() / (float) drawable.getIntrinsicWidth();
+
+            float drawableWidth = drawable.getIntrinsicWidth();
+            float drawableHeight = drawable.getIntrinsicHeight();
+
+            if (mDrawableWidth > 0) {
+                // save scale factor of image
+                if (drawableWidth > mDrawableWidth) {
+                    drawableWidth = mDrawableWidth;
+                    drawableHeight = drawableWidth * scaleFactor;
+                }
+            }
+            if (mDrawableHeight > 0) {
+                // save scale factor of image
+                if (drawableHeight > mDrawableHeight) {
+                    drawableHeight = mDrawableHeight;
+                    drawableWidth = drawableHeight / scaleFactor;
+                }
+            }
+
+            realBounds.right = realBounds.left + Math.round(drawableWidth);
+            realBounds.bottom = realBounds.top + Math.round(drawableHeight);
+
+            drawable.setBounds(realBounds);
+        }
+        setCompoundDrawablesRelative(drawables[0], drawables[1], drawables[2], drawables[3]);
+    }
+
+    public void setCompoundDrawablesRelativeWithSize(@Nullable final Drawable start,
+                                                     @Nullable final Drawable top,
+                                                     @Nullable final Drawable end,
+                                                     @Nullable final Drawable bottom) {
+        setCompoundDrawablesRelative(start, top, end, bottom);
+        initCompoundDrawableSize();
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/Tooltip.java b/app/src/main/java/awais/instagrabber/customviews/Tooltip.java
index 91a07e42..42bbbb6e 100644
--- a/app/src/main/java/awais/instagrabber/customviews/Tooltip.java
+++ b/app/src/main/java/awais/instagrabber/customviews/Tooltip.java
@@ -9,20 +9,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.AppCompatTextView;
 
 import awais.instagrabber.utils.AppExecutors;
 import awais.instagrabber.utils.Utils;
 import awais.instagrabber.utils.ViewUtils;
 
-
 public class Tooltip extends AppCompatTextView {
 
     private View anchor;
     private ViewPropertyAnimator animator;
     private boolean showing;
 
-    private final AppExecutors appExecutors;
+    private final AppExecutors appExecutors = AppExecutors.getInstance();
     private final Runnable dismissRunnable = () -> {
         animator = animate().alpha(0).setListener(new AnimatorListenerAdapter() {
             @Override
@@ -33,7 +33,7 @@ public class Tooltip extends AppCompatTextView {
         animator.start();
     };
 
-    public Tooltip(Context context, ViewGroup parentView, int backgroundColor, int textColor) {
+    public Tooltip(@NonNull Context context, @NonNull ViewGroup parentView, int backgroundColor, int textColor) {
         super(context);
         setBackgroundDrawable(ViewUtils.createRoundRectDrawable(Utils.convertDpToPx(3), backgroundColor));
         setTextColor(textColor);
@@ -43,7 +43,6 @@ public class Tooltip extends AppCompatTextView {
         parentView.addView(this, ViewUtils.createFrame(
                 ViewUtils.WRAP_CONTENT, ViewUtils.WRAP_CONTENT, Gravity.START | Gravity.TOP, 5, 0, 5, 3));
         setVisibility(GONE);
-        appExecutors = AppExecutors.getInstance();
     }
 
     @Override
diff --git a/app/src/main/java/awais/instagrabber/customviews/UsernameTextView.java b/app/src/main/java/awais/instagrabber/customviews/UsernameTextView.java
new file mode 100644
index 00000000..c2da60c3
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/UsernameTextView.java
@@ -0,0 +1,77 @@
+package awais.instagrabber.customviews;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import awais.instagrabber.R;
+import awais.instagrabber.utils.Utils;
+
+public class UsernameTextView extends AppCompatTextView {
+    private static final String TAG = UsernameTextView.class.getSimpleName();
+
+    private final int drawableSize = Utils.convertDpToPx(24);
+
+    private boolean verified;
+    private VerticalImageSpan verifiedSpan;
+
+    public UsernameTextView(@NonNull final Context context) {
+        this(context, null);
+    }
+
+    public UsernameTextView(@NonNull final Context context, @Nullable final AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public UsernameTextView(@NonNull final Context context, @Nullable final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        try {
+            final Drawable verifiedDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.verified);
+            final Drawable drawable = verifiedDrawable.mutate();
+            drawable.setBounds(0, 0, drawableSize, drawableSize);
+            verifiedSpan = new VerticalImageSpan(drawable);
+        } catch (Exception e) {
+            Log.e(TAG, "init: ", e);
+        }
+    }
+
+    public void setUsername(final CharSequence username) {
+        setUsername(username, false);
+    }
+
+    public void setUsername(final CharSequence username, final boolean verified) {
+        this.verified = verified;
+        final SpannableStringBuilder sb = new SpannableStringBuilder(username);
+        if (verified) {
+            try {
+                if (verifiedSpan != null) {
+                    sb.append("  ");
+                    sb.setSpan(verifiedSpan, sb.length() - 1, sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "bind: ", e);
+            }
+        }
+        super.setText(sb);
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    public void setVerified(final boolean verified) {
+        setUsername(getText(), verified);
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/VideoPlayerCallbackAdapter.java b/app/src/main/java/awais/instagrabber/customviews/VideoPlayerCallbackAdapter.java
index 30b9bbca..dd75c15f 100644
--- a/app/src/main/java/awais/instagrabber/customviews/VideoPlayerCallbackAdapter.java
+++ b/app/src/main/java/awais/instagrabber/customviews/VideoPlayerCallbackAdapter.java
@@ -1,5 +1,7 @@
 package awais.instagrabber.customviews;
 
+import com.google.android.exoplayer2.ui.StyledPlayerView;
+
 public class VideoPlayerCallbackAdapter implements VideoPlayerViewHelper.VideoPlayerCallback {
     @Override
     public void onThumbnailLoaded() {}
@@ -18,4 +20,12 @@ public class VideoPlayerCallbackAdapter implements VideoPlayerViewHelper.VideoPl
 
     @Override
     public void onRelease() {}
+
+    @Override
+    public void onFullScreenModeChanged(final boolean isFullScreen, final StyledPlayerView playerView) {}
+
+    @Override
+    public boolean isInFullScreen() {
+        return false;
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/customviews/VideoPlayerViewHelper.java b/app/src/main/java/awais/instagrabber/customviews/VideoPlayerViewHelper.java
index b2cfc2f1..6ce21a77 100644
--- a/app/src/main/java/awais/instagrabber/customviews/VideoPlayerViewHelper.java
+++ b/app/src/main/java/awais/instagrabber/customviews/VideoPlayerViewHelper.java
@@ -1,123 +1,70 @@
 package awais.instagrabber.customviews;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.drawable.Animatable;
 import android.net.Uri;
-import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.appcompat.widget.PopupMenu;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageButton;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder;
 import com.facebook.drawee.controller.BaseControllerListener;
-import com.facebook.drawee.interfaces.DraweeController;
 import com.facebook.imagepipeline.image.ImageInfo;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.audio.AudioListener;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.ui.StyledPlayerControlView;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.material.slider.LabelFormatter;
-import com.google.android.material.slider.Slider;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import awais.instagrabber.R;
-import awais.instagrabber.databinding.LayoutExoCustomControlsBinding;
 import awais.instagrabber.databinding.LayoutVideoPlayerWithThumbnailBinding;
-import awais.instagrabber.utils.TextUtils;
-
-import static com.google.android.exoplayer2.C.TIME_UNSET;
-import static com.google.android.exoplayer2.Player.STATE_ENDED;
-import static com.google.android.exoplayer2.Player.STATE_IDLE;
-import static com.google.android.exoplayer2.Player.STATE_READY;
+import awais.instagrabber.utils.Utils;
 
 public class VideoPlayerViewHelper implements Player.EventListener {
-    private static final String TAG = "VideoPlayerViewHelper";
-    private static final long INITIAL_DELAY = 0;
-    private static final long RECURRING_DELAY = 60;
+    private static final String TAG = VideoPlayerViewHelper.class.getSimpleName();
 
     private final Context context;
-    private final awais.instagrabber.databinding.LayoutVideoPlayerWithThumbnailBinding binding;
+    private final LayoutVideoPlayerWithThumbnailBinding binding;
     private final float initialVolume;
     private final float thumbnailAspectRatio;
     private final String thumbnailUrl;
     private final boolean loadPlayerOnClick;
-    private final awais.instagrabber.databinding.LayoutExoCustomControlsBinding controlsBinding;
     private final VideoPlayerCallback videoPlayerCallback;
     private final String videoUrl;
     private final DefaultDataSourceFactory dataSourceFactory;
     private SimpleExoPlayer player;
-    private PopupMenu speedPopup;
-    private PositionCheckRunnable positionChecker;
-    private Handler positionUpdateHandler;
+    private AppCompatImageButton mute;
 
-    private final Player.EventListener listener = new Player.EventListener() {
-        @Override
-        public void onPlaybackStateChanged(final int state) {
-            switch (state) {
-                case Player.STATE_BUFFERING:
-                case STATE_IDLE:
-                case STATE_ENDED:
-                    positionUpdateHandler.removeCallbacks(positionChecker);
-                    return;
-                case STATE_READY:
-                    setupTimeline();
-                    positionUpdateHandler.postDelayed(positionChecker, INITIAL_DELAY);
-                    break;
-            }
-        }
-
-        @Override
-        public void onPlayWhenReadyChanged(final boolean playWhenReady, final int reason) {
-            updatePlayPauseDrawable(playWhenReady);
-            if (positionUpdateHandler == null || positionChecker == null) return;
-            if (playWhenReady) {
-                positionUpdateHandler.removeCallbacks(positionChecker);
-                positionUpdateHandler.postDelayed(positionChecker, INITIAL_DELAY);
-            }
-        }
-    };
     private final AudioListener audioListener = new AudioListener() {
         @Override
         public void onVolumeChanged(final float volume) {
             updateMuteIcon(volume);
         }
     };
-    private final Slider.OnChangeListener onChangeListener = (slider, value, fromUser) -> {
-        if (!fromUser) return;
-        long actualValue = (long) value;
-        if (actualValue < 0) {
-            actualValue = 0;
-        } else if (actualValue > player.getDuration()) {
-            actualValue = player.getDuration();
-        }
-        player.seekTo(actualValue);
-    };
-    private final View.OnClickListener onClickListener = v -> player.setPlayWhenReady(!player.getPlayWhenReady());
-    private final LabelFormatter labelFormatter = value -> TextUtils.millisToTimeString((long) value);
     private final View.OnClickListener muteOnClickListener = v -> toggleMute();
-    private final View.OnClickListener rewOnClickListener = v -> {
-        final long positionMs = player.getCurrentPosition() - 5000;
-        player.seekTo(positionMs < 0 ? 0 : positionMs);
-    };
-    private final View.OnClickListener ffOnClickListener = v -> {
-        long positionMs = player.getCurrentPosition() + 5000;
-        long duration = player.getDuration();
-        if (duration == TIME_UNSET) {
-            duration = 0;
-        }
-        player.seekTo(Math.min(positionMs, duration));
-    };
-    private final View.OnClickListener showMenu = this::showMenu;
+    private Object layoutManager;
 
     public VideoPlayerViewHelper(@NonNull final Context context,
                                  @NonNull final LayoutVideoPlayerWithThumbnailBinding binding,
@@ -126,7 +73,6 @@ public class VideoPlayerViewHelper implements Player.EventListener {
                                  final float thumbnailAspectRatio,
                                  final String thumbnailUrl,
                                  final boolean loadPlayerOnClick,
-                                 final LayoutExoCustomControlsBinding controlsBinding,
                                  final VideoPlayerCallback videoPlayerCallback) {
         this.context = context;
         this.binding = binding;
@@ -134,7 +80,6 @@ public class VideoPlayerViewHelper implements Player.EventListener {
         this.thumbnailAspectRatio = thumbnailAspectRatio;
         this.thumbnailUrl = thumbnailUrl;
         this.loadPlayerOnClick = loadPlayerOnClick;
-        this.controlsBinding = controlsBinding;
         this.videoPlayerCallback = videoPlayerCallback;
         this.videoUrl = videoUrl;
         this.dataSourceFactory = new DefaultDataSourceFactory(binding.getRoot().getContext(), "instagram");
@@ -151,40 +96,43 @@ public class VideoPlayerViewHelper implements Player.EventListener {
             }
         });
         setThumbnail();
-        setupControls();
     }
 
     private void setThumbnail() {
         binding.thumbnail.setAspectRatio(thumbnailAspectRatio);
-        final ImageRequest thumbnailRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(thumbnailUrl))
-                                                                 .build();
-        final DraweeController controller = Fresco.newDraweeControllerBuilder()
-                                                  .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                                                      @Override
-                                                      public void onFailure(final String id, final Throwable throwable) {
-                                                          if (videoPlayerCallback != null) {
-                                                              videoPlayerCallback.onThumbnailLoaded();
-                                                          }
-                                                      }
+        ImageRequest thumbnailRequest = null;
+        if (thumbnailUrl != null) {
+            thumbnailRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(thumbnailUrl)).build();
+        }
+        final PipelineDraweeControllerBuilder builder = Fresco
+                .newDraweeControllerBuilder()
+                .setControllerListener(new BaseControllerListener<ImageInfo>() {
+                    @Override
+                    public void onFailure(final String id, final Throwable throwable) {
+                        if (videoPlayerCallback != null) {
+                            videoPlayerCallback.onThumbnailLoaded();
+                        }
+                    }
 
-                                                      @Override
-                                                      public void onFinalImageSet(final String id,
-                                                                                  final ImageInfo imageInfo,
-                                                                                  final Animatable animatable) {
-                                                          if (videoPlayerCallback != null) {
-                                                              videoPlayerCallback.onThumbnailLoaded();
-                                                          }
-                                                      }
-                                                  })
-                                                  .setImageRequest(thumbnailRequest)
-                                                  .build();
-        binding.thumbnail.setController(controller);
+                    @Override
+                    public void onFinalImageSet(final String id,
+                                                final ImageInfo imageInfo,
+                                                final Animatable animatable) {
+                        if (videoPlayerCallback != null) {
+                            videoPlayerCallback.onThumbnailLoaded();
+                        }
+                    }
+                });
+        if (thumbnailRequest != null) {
+            builder.setImageRequest(thumbnailRequest);
+        }
+        binding.thumbnail.setController(builder.build());
     }
 
     private void loadPlayer() {
         if (videoUrl == null) return;
-        if (binding.root.getDisplayedChild() == 0) {
-            binding.root.showNext();
+        if (binding.getRoot().getDisplayedChild() == 0) {
+            binding.getRoot().showNext();
         }
         if (videoPlayerCallback != null) {
             videoPlayerCallback.onPlayerViewLoaded();
@@ -193,15 +141,15 @@ public class VideoPlayerViewHelper implements Player.EventListener {
         if (player != null) {
             player.release();
         }
+        final ViewGroup.LayoutParams playerViewLayoutParams = binding.playerView.getLayoutParams();
+        if (playerViewLayoutParams.height > Utils.displayMetrics.heightPixels * 0.8) {
+            playerViewLayoutParams.height = (int) (Utils.displayMetrics.heightPixels * 0.8);
+        }
         player = new SimpleExoPlayer.Builder(context)
                 .setLooper(Looper.getMainLooper())
                 .build();
-        positionUpdateHandler = new Handler();
-        positionChecker = new PositionCheckRunnable(positionUpdateHandler,
-                                                    player,
-                                                    controlsBinding.timeline,
-                                                    controlsBinding.fromTime);
         player.addListener(this);
+        player.addAudioListener(audioListener);
         player.setVolume(initialVolume);
         player.setPlayWhenReady(true);
         player.setRepeatMode(Player.REPEAT_MODE_ALL);
@@ -209,123 +157,116 @@ public class VideoPlayerViewHelper implements Player.EventListener {
         final MediaItem mediaItem = MediaItem.fromUri(videoUrl);
         final ProgressiveMediaSource mediaSource = sourceFactory.createMediaSource(mediaItem);
         player.setMediaSource(mediaSource);
-        setupControls();
         player.prepare();
         binding.playerView.setPlayer(player);
+        binding.playerView.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FIT);
+        binding.playerView.setShowNextButton(false);
+        binding.playerView.setShowPreviousButton(false);
+        binding.playerView.setControllerOnFullScreenModeChangedListener(isFullScreen -> {
+            if (videoPlayerCallback == null) return;
+            videoPlayerCallback.onFullScreenModeChanged(isFullScreen, binding.playerView);
+        });
+        setupControllerView();
     }
 
-    private void setupControls() {
-        if (controlsBinding == null) return;
-        binding.playerView.setUseController(false);
-        if (player == null) {
-            enableControls(false);
-            // controlsBinding.playPause.setEnabled(true);
-            // controlsBinding.playPause.setOnClickListener(new NoPlayerPlayPauseClickListener(binding.thumbnailParent));
+    private void setupControllerView() {
+        try {
+            final StyledPlayerControlView controllerView = getStyledPlayerControlView();
+            if (controllerView == null) return;
+            layoutManager = setControlViewLayoutManager(controllerView);
+            if (videoPlayerCallback != null && videoPlayerCallback.isInFullScreen()) {
+                setControllerViewToFullScreenMode(controllerView);
+            }
+            final ViewGroup exoBasicControls = controllerView.findViewById(R.id.exo_basic_controls);
+            if (exoBasicControls == null) return;
+            mute = new AppCompatImageButton(context);
+            final Resources resources = context.getResources();
+            if (resources == null) return;
+            final int width = resources.getDimensionPixelSize(R.dimen.exo_small_icon_width);
+            final int height = resources.getDimensionPixelSize(R.dimen.exo_small_icon_height);
+            final int margin = resources.getDimensionPixelSize(R.dimen.exo_small_icon_horizontal_margin);
+            final int paddingHorizontal = resources.getDimensionPixelSize(R.dimen.exo_small_icon_padding_horizontal);
+            final int paddingVertical = resources.getDimensionPixelSize(R.dimen.exo_small_icon_padding_vertical);
+            final ViewGroup.MarginLayoutParams layoutParams = new ViewGroup.MarginLayoutParams(width, height);
+            layoutParams.setMargins(margin, 0, margin, 0);
+            mute.setLayoutParams(layoutParams);
+            mute.setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical);
+            mute.setScaleType(ImageView.ScaleType.FIT_XY);
+            mute.setBackgroundResource(Utils.getAttrResId(context, android.R.attr.selectableItemBackground));
+            mute.setImageTintList(ColorStateList.valueOf(resources.getColor(R.color.white)));
+            updateMuteIcon(player.getVolume());
+            exoBasicControls.addView(mute, 0);
+            mute.setOnClickListener(muteOnClickListener);
+        } catch (Exception e) {
+            Log.e(TAG, "loadPlayer: ", e);
+        }
+    }
+
+    @Nullable
+    private Object setControlViewLayoutManager(@NonNull final StyledPlayerControlView controllerView)
+            throws NoSuchFieldException, IllegalAccessException {
+        final Field controlViewLayoutManagerField = controllerView.getClass().getDeclaredField("controlViewLayoutManager");
+        controlViewLayoutManagerField.setAccessible(true);
+        return controlViewLayoutManagerField.get(controllerView);
+    }
+
+    private void setControllerViewToFullScreenMode(@NonNull final StyledPlayerControlView controllerView)
+            throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+        // Exoplayer doesn't expose the fullscreen state, so using reflection
+        final Field fullScreenButtonField = controllerView.getClass().getDeclaredField("fullScreenButton");
+        fullScreenButtonField.setAccessible(true);
+        final ImageView fullScreenButton = (ImageView) fullScreenButtonField.get(controllerView);
+        final Field isFullScreen = controllerView.getClass().getDeclaredField("isFullScreen");
+        isFullScreen.setAccessible(true);
+        isFullScreen.set(controllerView, true);
+        final Method updateFullScreenButtonForState = controllerView
+                .getClass()
+                .getDeclaredMethod("updateFullScreenButtonForState", ImageView.class, boolean.class);
+        updateFullScreenButtonForState.setAccessible(true);
+        updateFullScreenButtonForState.invoke(controllerView, fullScreenButton, true);
+
+    }
+
+    @Nullable
+    private StyledPlayerControlView getStyledPlayerControlView() throws NoSuchFieldException, IllegalAccessException {
+        final Field controller = binding.playerView.getClass().getDeclaredField("controller");
+        controller.setAccessible(true);
+        return (StyledPlayerControlView) controller.get(binding.playerView);
+    }
+
+    @Override
+    public void onTracksChanged(@NonNull TrackGroupArray trackGroups, @NonNull TrackSelectionArray trackSelections) {
+        if (trackGroups.isEmpty()) {
+            setHasAudio(false);
             return;
         }
-        enableControls(true);
-        updatePlayPauseDrawable(player.getPlayWhenReady());
-        updateMuteIcon(player.getVolume());
-        player.addListener(listener);
-        player.addAudioListener(audioListener);
-        controlsBinding.timeline.addOnChangeListener(onChangeListener);
-        controlsBinding.timeline.setLabelFormatter(labelFormatter);
-        controlsBinding.playPause.setOnClickListener(onClickListener);
-        controlsBinding.mute.setOnClickListener(muteOnClickListener);
-        controlsBinding.rewWithAmount.setOnClickListener(rewOnClickListener);
-        controlsBinding.ffWithAmount.setOnClickListener(ffOnClickListener);
-        controlsBinding.speed.setOnClickListener(showMenu);
-    }
-
-    private void setupTimeline() {
-        final long duration = player.getDuration();
-        controlsBinding.timeline.setEnabled(true);
-        controlsBinding.timeline.setValueFrom(0);
-        controlsBinding.timeline.setValueTo(duration);
-        controlsBinding.fromTime.setText(TextUtils.millisToTimeString(0));
-        controlsBinding.toTime.setText(TextUtils.millisToTimeString(duration));
-    }
-
-    private void enableControls(final boolean enable) {
-        controlsBinding.speed.setEnabled(enable);
-        controlsBinding.speed.setClickable(enable);
-        controlsBinding.mute.setEnabled(enable);
-        controlsBinding.mute.setClickable(enable);
-        controlsBinding.ffWithAmount.setEnabled(enable);
-        controlsBinding.ffWithAmount.setClickable(enable);
-        controlsBinding.rewWithAmount.setEnabled(enable);
-        controlsBinding.rewWithAmount.setClickable(enable);
-        controlsBinding.fromTime.setEnabled(enable);
-        controlsBinding.toTime.setEnabled(enable);
-        controlsBinding.playPause.setEnabled(enable);
-        controlsBinding.playPause.setClickable(enable);
-        controlsBinding.timeline.setEnabled(enable);
-    }
-
-    public void showMenu(View anchor) {
-        PopupMenu popup = getPopupMenu(anchor);
-        popup.show();
-    }
-
-    @NonNull
-    private PopupMenu getPopupMenu(final View anchor) {
-        if (speedPopup != null) {
-            return speedPopup;
-        }
-        final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(context, R.style.popupMenuStyle);
-        // final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(context, R.style.Widget_MaterialComponents_PopupMenu_Exoplayer);
-        speedPopup = new PopupMenu(themeWrapper, anchor);
-        speedPopup.getMenuInflater().inflate(R.menu.speed_menu, speedPopup.getMenu());
-        speedPopup.setOnMenuItemClickListener(item -> {
-            float nextSpeed;
-            int textResId;
-            int itemId = item.getItemId();
-            if (itemId == R.id.pt_two_five_x) {
-                nextSpeed = 0.25f;
-                textResId = R.string.pt_two_five_x;
-            } else if (itemId == R.id.pt_five_x) {
-                nextSpeed = 0.5f;
-                textResId = R.string.pt_five_x;
-            } else if (itemId == R.id.pt_seven_five_x) {
-                nextSpeed = 0.75f;
-                textResId = R.string.pt_seven_five_x;
-            } else if (itemId == R.id.one_x) {
-                nextSpeed = 1f;
-                textResId = R.string.one_x;
-            } else if (itemId == R.id.one_pt_two_five_x) {
-                nextSpeed = 1.25f;
-                textResId = R.string.one_pt_two_five_x;
-            } else if (itemId == R.id.one_pt_five_x) {
-                nextSpeed = 1.5f;
-                textResId = R.string.one_pt_five_x;
-            } else if (itemId == R.id.two_x) {
-                nextSpeed = 2f;
-                textResId = R.string.two_x;
-            } else {
-                nextSpeed = 1;
-                textResId = R.string.one_x;
+        boolean hasAudio = false;
+        for (int i = 0; i < trackGroups.length; i++) {
+            for (int g = 0; g < trackGroups.get(i).length; g++) {
+                final String sampleMimeType = trackGroups.get(i).getFormat(g).sampleMimeType;
+                if (sampleMimeType != null && sampleMimeType.contains("audio")) {
+                    hasAudio = true;
+                    break;
+                }
             }
-            player.setPlaybackParameters(new PlaybackParameters(nextSpeed));
-            controlsBinding.speed.setText(textResId);
-            return true;
-        });
-        return speedPopup;
+        }
+        setHasAudio(hasAudio);
+    }
+
+    private void setHasAudio(final boolean hasAudio) {
+        if (mute == null) return;
+        mute.setEnabled(hasAudio);
+        mute.setAlpha(hasAudio ? 1f : 0.5f);
+        updateMuteIcon(hasAudio ? 1f : 0f);
     }
 
     private void updateMuteIcon(final float volume) {
+        if (mute == null) return;
         if (volume == 0) {
-            controlsBinding.mute.setIconResource(R.drawable.ic_volume_off_24_states);
+            mute.setImageResource(R.drawable.ic_volume_off_24);
             return;
         }
-        controlsBinding.mute.setIconResource(R.drawable.ic_volume_up_24_states);
-    }
-
-    private void updatePlayPauseDrawable(final boolean playWhenReady) {
-        if (playWhenReady) {
-            controlsBinding.playPause.setIconResource(R.drawable.ic_pause_24);
-            return;
-        }
-        controlsBinding.playPause.setIconResource(R.drawable.ic_play_states);
+        mute.setImageResource(R.drawable.ic_volume_up_24);
     }
 
     @Override
@@ -339,25 +280,24 @@ public class VideoPlayerViewHelper implements Player.EventListener {
     }
 
     @Override
-    public void onPlayerError(final ExoPlaybackException error) {
+    public void onPlayerError(@NonNull final ExoPlaybackException error) {
         Log.e(TAG, "onPlayerError", error);
     }
 
-    public float toggleMute() {
-        if (player == null) return 0;
+    private void toggleMute() {
+        if (player == null) return;
+        if (layoutManager != null) {
+            try {
+                final Method resetHideCallbacks = layoutManager.getClass().getDeclaredMethod("resetHideCallbacks");
+                resetHideCallbacks.invoke(layoutManager);
+            } catch (Exception e) {
+                Log.e(TAG, "toggleMute: ", e);
+            }
+        }
         final float vol = player.getVolume() == 0f ? 1f : 0f;
         player.setVolume(vol);
-        return vol;
     }
 
-    // public void togglePlayback() {
-    //     if (player == null) return;
-    //     final int playbackState = player.getPlaybackState();
-    //     if (playbackState == STATE_IDLE || playbackState == STATE_ENDED) return;
-    //     final boolean playWhenReady = player.getPlayWhenReady();
-    //     player.setPlayWhenReady(!playWhenReady);
-    // }
-
     public void releasePlayer() {
         if (videoPlayerCallback != null) {
             videoPlayerCallback.onRelease();
@@ -366,84 +306,12 @@ public class VideoPlayerViewHelper implements Player.EventListener {
             player.release();
             player = null;
         }
-        if (positionUpdateHandler != null) {
-            if (positionChecker != null) {
-                positionUpdateHandler.removeCallbacks(positionChecker);
-                positionChecker = null;
-            }
-            positionUpdateHandler = null;
-        }
     }
 
     public void pause() {
         if (player != null) {
             player.pause();
         }
-        if (positionUpdateHandler != null) {
-            if (positionChecker != null) {
-                positionUpdateHandler.removeCallbacks(positionChecker);
-            }
-        }
-    }
-
-    public void resetTimeline() {
-        if (player == null) {
-            enableControls(false);
-            return;
-        }
-        setupTimeline();
-        final long currentPosition = player.getCurrentPosition();
-        controlsBinding.timeline.setValue(Math.min(currentPosition, player.getDuration()));
-        setupControls();
-    }
-
-    public void removeCallbacks() {
-        if (player != null) {
-            player.removeListener(listener);
-            player.removeAudioListener(audioListener);
-        }
-        controlsBinding.timeline.removeOnChangeListener(onChangeListener);
-        controlsBinding.timeline.setLabelFormatter(null);
-        controlsBinding.playPause.setOnClickListener(null);
-        controlsBinding.mute.setOnClickListener(null);
-        controlsBinding.rewWithAmount.setOnClickListener(null);
-        controlsBinding.ffWithAmount.setOnClickListener(null);
-        controlsBinding.speed.setOnClickListener(null);
-    }
-
-    private static class PositionCheckRunnable implements Runnable {
-        private final Handler positionUpdateHandler;
-        private final SimpleExoPlayer player;
-        private final Slider timeline;
-        private final AppCompatTextView fromTime;
-
-        public PositionCheckRunnable(final Handler positionUpdateHandler,
-                                     final SimpleExoPlayer simpleExoPlayer,
-                                     final Slider slider,
-                                     final AppCompatTextView fromTime) {
-            this.positionUpdateHandler = positionUpdateHandler;
-            this.player = simpleExoPlayer;
-            this.timeline = slider;
-            this.fromTime = fromTime;
-        }
-
-        @Override
-        public void run() {
-            if (positionUpdateHandler == null) return;
-            positionUpdateHandler.removeCallbacks(this);
-            if (player == null) return;
-            final long currentPosition = player.getCurrentPosition();
-            final long duration = player.getDuration();
-            if (duration == TIME_UNSET) {
-                timeline.setValueFrom(0);
-                timeline.setValueTo(0);
-                timeline.setEnabled(false);
-                return;
-            }
-            timeline.setValue(Math.min(currentPosition, duration));
-            fromTime.setText(TextUtils.millisToTimeString(currentPosition));
-            positionUpdateHandler.postDelayed(this, RECURRING_DELAY);
-        }
     }
 
     public interface VideoPlayerCallback {
@@ -458,5 +326,9 @@ public class VideoPlayerViewHelper implements Player.EventListener {
         void onPause();
 
         void onRelease();
+
+        void onFullScreenModeChanged(boolean isFullScreen, final StyledPlayerView playerView);
+
+        boolean isInFullScreen();
     }
 }
diff --git a/app/src/main/java/awais/instagrabber/customviews/drawee/ZoomableDraweeView.java b/app/src/main/java/awais/instagrabber/customviews/drawee/ZoomableDraweeView.java
index 5a7d55ad..d8b7b8f9 100644
--- a/app/src/main/java/awais/instagrabber/customviews/drawee/ZoomableDraweeView.java
+++ b/app/src/main/java/awais/instagrabber/customviews/drawee/ZoomableDraweeView.java
@@ -228,7 +228,7 @@ public class ZoomableDraweeView extends DraweeView<GenericDraweeHierarchy>
 
     public void setZoomingEnabled(boolean zoomingEnabled) {
         mZoomingEnabled = zoomingEnabled;
-        mZoomableController.setEnabled(false);
+        mZoomableController.setEnabled(zoomingEnabled);
     }
 
     /**
diff --git a/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiBottomSheetDialog.java b/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiBottomSheetDialog.java
new file mode 100644
index 00000000..cdf5767c
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiBottomSheetDialog.java
@@ -0,0 +1,100 @@
+package awais.instagrabber.customviews.emoji;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import awais.instagrabber.R;
+import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration;
+import awais.instagrabber.utils.Utils;
+
+public class EmojiBottomSheetDialog extends BottomSheetDialogFragment {
+    public static final String TAG = EmojiBottomSheetDialog.class.getSimpleName();
+
+    private RecyclerView grid;
+    private EmojiPicker.OnEmojiClickListener callback;
+
+    @NonNull
+    public static EmojiBottomSheetDialog newInstance() {
+        // Bundle args = new Bundle();
+        // fragment.setArguments(args);
+        return new EmojiBottomSheetDialog();
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStyle(DialogFragment.STYLE_NORMAL, R.style.ThemeOverlay_Rounded_BottomSheetDialog);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
+        final Context context = getContext();
+        if (context == null) return null;
+        grid = new RecyclerView(context);
+        return grid;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        init();
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final Dialog dialog = getDialog();
+        if (dialog == null) return;
+        final BottomSheetDialog bottomSheetDialog = (BottomSheetDialog) dialog;
+        final View bottomSheetInternal = bottomSheetDialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
+        if (bottomSheetInternal == null) return;
+        bottomSheetInternal.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+        bottomSheetInternal.requestLayout();
+    }
+
+    @Override
+    public void onAttach(@NonNull final Context context) {
+        super.onAttach(context);
+        final Fragment parentFragment = getParentFragment();
+        if (parentFragment instanceof EmojiPicker.OnEmojiClickListener) {
+            callback = (EmojiPicker.OnEmojiClickListener) parentFragment;
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        grid = null;
+        super.onDestroyView();
+    }
+
+    private void init() {
+        final Context context = getContext();
+        if (context == null) return;
+        final GridLayoutManager gridLayoutManager = new GridLayoutManager(context, 9);
+        grid.setLayoutManager(gridLayoutManager);
+        grid.setHasFixedSize(true);
+        grid.setClipToPadding(false);
+        grid.addItemDecoration(new GridSpacingItemDecoration(Utils.convertDpToPx(8)));
+        final EmojiGridAdapter adapter = new EmojiGridAdapter(null, (view, emoji) -> {
+            if (callback != null) {
+                callback.onClick(view, emoji);
+            }
+            dismiss();
+        }, null);
+        grid.setAdapter(adapter);
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiGridAdapter.java b/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiGridAdapter.java
index 5aff4472..1f0a7c7f 100644
--- a/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiGridAdapter.java
+++ b/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiGridAdapter.java
@@ -43,7 +43,7 @@ public class EmojiGridAdapter extends RecyclerView.Adapter<EmojiGridAdapter.Emoj
     private final EmojiVariantManager emojiVariantManager;
     private final AppExecutors appExecutors;
 
-    public EmojiGridAdapter(@NonNull final EmojiCategoryType emojiCategoryType,
+    public EmojiGridAdapter(final EmojiCategoryType emojiCategoryType,
                             final OnEmojiClickListener onEmojiClickListener,
                             final OnEmojiLongClickListener onEmojiLongClickListener) {
         this.onEmojiClickListener = onEmojiClickListener;
@@ -55,6 +55,11 @@ public class EmojiGridAdapter extends RecyclerView.Adapter<EmojiGridAdapter.Emoj
         emojiVariantManager = EmojiVariantManager.getInstance();
         appExecutors = AppExecutors.getInstance();
         setHasStableIds(true);
+        if (emojiCategoryType == null) {
+            // show all if type is null
+            differ.submitList(ImmutableList.copyOf(emojiParser.getAllEmojis().values()));
+            return;
+        }
         final EmojiCategory emojiCategory = categoryMap.get(emojiCategoryType);
         if (emojiCategory == null) {
             differ.submitList(Collections.emptyList());
@@ -105,7 +110,7 @@ public class EmojiGridAdapter extends RecyclerView.Adapter<EmojiGridAdapter.Emoj
     }
 
     public static class EmojiViewHolder extends RecyclerView.ViewHolder {
-        private final AppExecutors appExecutors = AppExecutors.getInstance();
+        // private final AppExecutors appExecutors = AppExecutors.getInstance();
         private final ItemEmojiGridBinding binding;
         private final OnEmojiClickListener onEmojiClickListener;
         private final OnEmojiLongClickListener onEmojiLongClickListener;
@@ -123,17 +128,17 @@ public class EmojiGridAdapter extends RecyclerView.Adapter<EmojiGridAdapter.Emoj
             binding.image.setImageDrawable(null);
             binding.indicator.setVisibility(View.GONE);
             itemView.setOnLongClickListener(null);
-            itemView.post(() -> {
-                binding.image.setImageDrawable(emoji.getDrawable());
-                final boolean hasVariants = !parent.getVariants().isEmpty();
-                binding.indicator.setVisibility(hasVariants ? View.VISIBLE : View.GONE);
-                if (onEmojiClickListener != null) {
-                    itemView.setOnClickListener(v -> onEmojiClickListener.onClick(v, emoji));
-                }
-                if (hasVariants && onEmojiLongClickListener != null) {
-                    itemView.setOnLongClickListener(v -> onEmojiLongClickListener.onLongClick(position, v, parent));
-                }
-            });
+            // itemView.post(() -> {
+            binding.image.setImageDrawable(emoji.getDrawable());
+            final boolean hasVariants = !parent.getVariants().isEmpty();
+            binding.indicator.setVisibility(hasVariants ? View.VISIBLE : View.GONE);
+            if (onEmojiClickListener != null) {
+                itemView.setOnClickListener(v -> onEmojiClickListener.onClick(v, emoji));
+            }
+            if (hasVariants && onEmojiLongClickListener != null) {
+                itemView.setOnLongClickListener(v -> onEmojiLongClickListener.onLongClick(position, v, parent));
+            }
+            // });
         }
     }
 
diff --git a/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiPopupWindow.java b/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiPopupWindow.java
deleted file mode 100644
index 76673590..00000000
--- a/app/src/main/java/awais/instagrabber/customviews/emoji/EmojiPopupWindow.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package awais.instagrabber.customviews.emoji;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.view.Gravity;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.PopupWindow;
-
-import awais.instagrabber.R;
-import awais.instagrabber.customviews.emoji.EmojiPicker.OnBackspaceClickListener;
-import awais.instagrabber.customviews.emoji.EmojiPicker.OnEmojiClickListener;
-import awais.instagrabber.utils.Utils;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-
-/**
- * https://stackoverflow.com/a/33897583/1436766
- */
-public class EmojiPopupWindow extends PopupWindow {
-
-    private int keyBoardHeight = 0;
-    private Boolean pendingOpen = false;
-    private Boolean isOpened = false;
-    private final View rootView;
-    private final Context context;
-    private final OnEmojiClickListener onEmojiClickListener;
-    private final OnBackspaceClickListener onBackspaceClickListener;
-
-    private OnSoftKeyboardOpenCloseListener onSoftKeyboardOpenCloseListener;
-
-
-    /**
-     * Constructor
-     *
-     * @param rootView The top most layout in your view hierarchy. The difference of this view and the screen height will be used to calculate the keyboard height.
-     */
-    public EmojiPopupWindow(final View rootView,
-                            final OnEmojiClickListener onEmojiClickListener,
-                            final OnBackspaceClickListener onBackspaceClickListener) {
-        super(rootView.getContext());
-        this.rootView = rootView;
-        this.context = rootView.getContext();
-        this.onEmojiClickListener = onEmojiClickListener;
-        this.onBackspaceClickListener = onBackspaceClickListener;
-        View customView = createCustomView();
-        setContentView(customView);
-        setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        //default size
-        setSize((int) context.getResources().getDimension(R.dimen.keyboard_height), MATCH_PARENT);
-    }
-
-    /**
-     * Set the listener for the event of keyboard opening or closing.
-     */
-    public void setOnSoftKeyboardOpenCloseListener(OnSoftKeyboardOpenCloseListener listener) {
-        this.onSoftKeyboardOpenCloseListener = listener;
-    }
-
-    /**
-     * Use this function to show the emoji popup.
-     * NOTE: Since, the soft keyboard sizes are variable on different android devices, the
-     * library needs you to open the soft keyboard atleast once before calling this function.
-     * If that is not possible see showAtBottomPending() function.
-     */
-    public void showAtBottom() {
-        showAtLocation(rootView, Gravity.BOTTOM, 0, 0);
-    }
-
-    /**
-     * Use this function when the soft keyboard has not been opened yet. This
-     * will show the emoji popup after the keyboard is up next time.
-     * Generally, you will be calling InputMethodManager.showSoftInput function after
-     * calling this function.
-     */
-    public void showAtBottomPending() {
-        if (isKeyBoardOpen())
-            showAtBottom();
-        else
-            pendingOpen = true;
-    }
-
-    /**
-     * @return Returns true if the soft keyboard is open, false otherwise.
-     */
-    public Boolean isKeyBoardOpen() {
-        return isOpened;
-    }
-
-    /**
-     * Dismiss the popup
-     */
-    @Override
-    public void dismiss() {
-        super.dismiss();
-    }
-
-    /**
-     * Call this function to resize the emoji popup according to your soft keyboard size
-     */
-    public void setSizeForSoftKeyboard() {
-        rootView.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
-            Rect r = new Rect();
-            rootView.getWindowVisibleDisplayFrame(r);
-
-            int screenHeight = getUsableScreenHeight();
-            int heightDifference = screenHeight - (r.bottom - r.top);
-            int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
-            if (resourceId > 0) {
-                heightDifference -= context.getResources()
-                                           .getDimensionPixelSize(resourceId);
-            }
-            if (heightDifference > 100) {
-                keyBoardHeight = heightDifference;
-                setSize(MATCH_PARENT, keyBoardHeight);
-                if (!isOpened) {
-                    if (onSoftKeyboardOpenCloseListener != null)
-                        onSoftKeyboardOpenCloseListener.onKeyboardOpen(keyBoardHeight);
-                }
-                isOpened = true;
-                if (pendingOpen) {
-                    showAtBottom();
-                    pendingOpen = false;
-                }
-            } else {
-                isOpened = false;
-                if (onSoftKeyboardOpenCloseListener != null)
-                    onSoftKeyboardOpenCloseListener.onKeyboardClose();
-            }
-        });
-    }
-
-    private int getUsableScreenHeight() {
-        return Utils.displayMetrics.heightPixels;
-    }
-
-    /**
-     * Manually set the popup window size
-     *
-     * @param width  Width of the popup
-     * @param height Height of the popup
-     */
-    public void setSize(int width, int height) {
-        setWidth(width);
-        setHeight(height);
-    }
-
-    private View createCustomView() {
-        final EmojiPicker emojiPicker = new EmojiPicker(context);
-        final LayoutParams layoutParams = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        emojiPicker.setLayoutParams(layoutParams);
-        emojiPicker.init(rootView, onEmojiClickListener, onBackspaceClickListener);
-        return emojiPicker;
-    }
-
-
-    public interface OnSoftKeyboardOpenCloseListener {
-        void onKeyboardOpen(int keyBoardHeight);
-
-        void onKeyboardClose();
-    }
-}
-
diff --git a/app/src/main/java/awais/instagrabber/customviews/emoji/GoogleCompatEmojiDrawable.java b/app/src/main/java/awais/instagrabber/customviews/emoji/GoogleCompatEmojiDrawable.java
index f2bec738..ae1aff00 100644
--- a/app/src/main/java/awais/instagrabber/customviews/emoji/GoogleCompatEmojiDrawable.java
+++ b/app/src/main/java/awais/instagrabber/customviews/emoji/GoogleCompatEmojiDrawable.java
@@ -25,7 +25,6 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.text.Spanned;
 import android.text.TextPaint;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.emoji.text.EmojiCompat;
diff --git a/app/src/main/java/awais/instagrabber/customviews/helpers/ChangeText.java b/app/src/main/java/awais/instagrabber/customviews/helpers/ChangeText.java
new file mode 100644
index 00000000..bd3613ec
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/customviews/helpers/ChangeText.java
@@ -0,0 +1,320 @@
+package awais.instagrabber.customviews.helpers;
+
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
+import android.graphics.Color;
+import android.util.Log;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.transition.Transition;
+import androidx.transition.TransitionListenerAdapter;
+import androidx.transition.TransitionValues;
+
+import java.util.Map;
+import java.util.Objects;
+
+import awais.instagrabber.BuildConfig;
+
+/**
+ * This transition tracks changes to the text in TextView targets. If the text
+ * changes between the start and end scenes, the transition ensures that the
+ * starting text stays until the transition ends, at which point it changes
+ * to the end text.  This is useful in situations where you want to resize a
+ * text view to its new size before displaying the text that goes there.
+ */
+public class ChangeText extends Transition {
+    private static final String LOG_TAG = "TextChange";
+    private static final String PROPNAME_TEXT = "android:textchange:text";
+    private static final String PROPNAME_TEXT_SELECTION_START =
+            "android:textchange:textSelectionStart";
+    private static final String PROPNAME_TEXT_SELECTION_END =
+            "android:textchange:textSelectionEnd";
+    private static final String PROPNAME_TEXT_COLOR = "android:textchange:textColor";
+    private int mChangeBehavior = CHANGE_BEHAVIOR_KEEP;
+    private boolean crossFade;
+    /**
+     * Flag specifying that the text in affected/changing TextView targets will keep
+     * their original text during the transition, setting it to the final text when
+     * the transition ends. This is the default behavior.
+     *
+     * @see #setChangeBehavior(int)
+     */
+    public static final int CHANGE_BEHAVIOR_KEEP = 0;
+    /**
+     * Flag specifying that the text changing animation should first fade
+     * out the original text completely. The new text is set on the target
+     * view at the end of the fade-out animation. This transition is typically
+     * used with a later {@link #CHANGE_BEHAVIOR_IN} transition, allowing more
+     * flexibility than the {@link #CHANGE_BEHAVIOR_OUT_IN} by allowing other
+     * transitions to be run sequentially or in parallel with these fades.
+     *
+     * @see #setChangeBehavior(int)
+     */
+    public static final int CHANGE_BEHAVIOR_OUT = 1;
+    /**
+     * Flag specifying that the text changing animation should fade in the
+     * end text into the affected target view(s). This transition is typically
+     * used in conjunction with an earlier {@link #CHANGE_BEHAVIOR_OUT}
+     * transition, possibly with other transitions running as well, such as
+     * a sequence to fade out, then resize the view, then fade in.
+     *
+     * @see #setChangeBehavior(int)
+     */
+    public static final int CHANGE_BEHAVIOR_IN = 2;
+    /**
+     * Flag specifying that the text changing animation should first fade
+     * out the original text completely and then fade in the
+     * new text.
+     *
+     * @see #setChangeBehavior(int)
+     */
+    public static final int CHANGE_BEHAVIOR_OUT_IN = 3;
+    private static final String[] sTransitionProperties = {
+            PROPNAME_TEXT,
+            PROPNAME_TEXT_SELECTION_START,
+            PROPNAME_TEXT_SELECTION_END
+    };
+
+    /**
+     * Sets the type of changing animation that will be run, one of
+     * {@link #CHANGE_BEHAVIOR_KEEP}, {@link #CHANGE_BEHAVIOR_OUT},
+     * {@link #CHANGE_BEHAVIOR_IN}, and {@link #CHANGE_BEHAVIOR_OUT_IN}.
+     *
+     * @param changeBehavior The type of fading animation to use when this
+     *                       transition is run.
+     * @return this textChange object.
+     */
+    public ChangeText setChangeBehavior(int changeBehavior) {
+        if (changeBehavior >= CHANGE_BEHAVIOR_KEEP && changeBehavior <= CHANGE_BEHAVIOR_OUT_IN) {
+            mChangeBehavior = changeBehavior;
+        }
+        return this;
+    }
+
+    public ChangeText setCrossFade(final boolean crossFade) {
+        this.crossFade = crossFade;
+        return this;
+    }
+
+    @Override
+    public String[] getTransitionProperties() {
+        return sTransitionProperties;
+    }
+
+    /**
+     * Returns the type of changing animation that will be run.
+     *
+     * @return either {@link #CHANGE_BEHAVIOR_KEEP}, {@link #CHANGE_BEHAVIOR_OUT},
+     * {@link #CHANGE_BEHAVIOR_IN}, or {@link #CHANGE_BEHAVIOR_OUT_IN}.
+     */
+    public int getChangeBehavior() {
+        return mChangeBehavior;
+    }
+
+    private void captureValues(TransitionValues transitionValues) {
+        if (transitionValues.view instanceof TextView) {
+            TextView textview = (TextView) transitionValues.view;
+            transitionValues.values.put(PROPNAME_TEXT, textview.getText());
+            if (textview instanceof EditText) {
+                transitionValues.values.put(PROPNAME_TEXT_SELECTION_START,
+                                            textview.getSelectionStart());
+                transitionValues.values.put(PROPNAME_TEXT_SELECTION_END,
+                                            textview.getSelectionEnd());
+            }
+            if (mChangeBehavior > CHANGE_BEHAVIOR_KEEP) {
+                transitionValues.values.put(PROPNAME_TEXT_COLOR, textview.getCurrentTextColor());
+            }
+        }
+    }
+
+    @Override
+    public void captureStartValues(@NonNull TransitionValues transitionValues) {
+        captureValues(transitionValues);
+    }
+
+    @Override
+    public void captureEndValues(@NonNull TransitionValues transitionValues) {
+        captureValues(transitionValues);
+    }
+
+    @Override
+    public Animator createAnimator(@NonNull ViewGroup sceneRoot, TransitionValues startValues,
+                                   TransitionValues endValues) {
+        if (startValues == null || endValues == null ||
+                !(startValues.view instanceof TextView) || !(endValues.view instanceof TextView)) {
+            return null;
+        }
+        final TextView view = (TextView) endValues.view;
+        Map<String, Object> startVals = startValues.values;
+        Map<String, Object> endVals = endValues.values;
+        final CharSequence startText = startVals.get(PROPNAME_TEXT) != null ?
+                                       (CharSequence) startVals.get(PROPNAME_TEXT) : "";
+        final CharSequence endText = endVals.get(PROPNAME_TEXT) != null ?
+                                     (CharSequence) endVals.get(PROPNAME_TEXT) : "";
+        final int startSelectionStart, startSelectionEnd, endSelectionStart, endSelectionEnd;
+        if (view instanceof EditText) {
+            startSelectionStart = startVals.get(PROPNAME_TEXT_SELECTION_START) != null ?
+                                  (Integer) startVals.get(PROPNAME_TEXT_SELECTION_START) : -1;
+            startSelectionEnd = startVals.get(PROPNAME_TEXT_SELECTION_END) != null ?
+                                (Integer) startVals.get(PROPNAME_TEXT_SELECTION_END) : startSelectionStart;
+            endSelectionStart = endVals.get(PROPNAME_TEXT_SELECTION_START) != null ?
+                                (Integer) endVals.get(PROPNAME_TEXT_SELECTION_START) : -1;
+            endSelectionEnd = endVals.get(PROPNAME_TEXT_SELECTION_END) != null ?
+                              (Integer) endVals.get(PROPNAME_TEXT_SELECTION_END) : endSelectionStart;
+        } else {
+            startSelectionStart = startSelectionEnd = endSelectionStart = endSelectionEnd = -1;
+        }
+        if (!Objects.equals(startText, endText)) {
+            final int startColor;
+            final int endColor;
+            if (mChangeBehavior != CHANGE_BEHAVIOR_IN) {
+                view.setText(startText);
+                if (view instanceof EditText) {
+                    setSelection(((EditText) view), startSelectionStart, startSelectionEnd);
+                }
+            }
+            Animator anim;
+            if (mChangeBehavior == CHANGE_BEHAVIOR_KEEP) {
+                startColor = endColor = 0;
+                anim = ValueAnimator.ofFloat(0, 1);
+                anim.addListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        if (Objects.equals(startText, view.getText())) {
+                            // Only set if it hasn't been changed since anim started
+                            view.setText(endText);
+                            if (view instanceof EditText) {
+                                setSelection(((EditText) view), endSelectionStart, endSelectionEnd);
+                            }
+                        }
+                    }
+                });
+            } else {
+                startColor = (Integer) startVals.get(PROPNAME_TEXT_COLOR);
+                endColor = (Integer) endVals.get(PROPNAME_TEXT_COLOR);
+                // Fade out start text
+                ValueAnimator outAnim = null, inAnim = null;
+                if (mChangeBehavior == CHANGE_BEHAVIOR_OUT_IN ||
+                        mChangeBehavior == CHANGE_BEHAVIOR_OUT) {
+                    outAnim = ValueAnimator.ofInt(Color.alpha(startColor), 0);
+                    outAnim.addUpdateListener(animation -> {
+                        int currAlpha = (Integer) animation.getAnimatedValue();
+                        view.setTextColor(currAlpha << 24 | startColor & 0xffffff);
+                    });
+                    outAnim.addListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationEnd(Animator animation) {
+                            if (Objects.equals(startText, view.getText())) {
+                                // Only set if it hasn't been changed since anim started
+                                view.setText(endText);
+                                if (view instanceof EditText) {
+                                    setSelection(((EditText) view), endSelectionStart,
+                                                 endSelectionEnd);
+                                }
+                            }
+                            // restore opaque alpha and correct end color
+                            view.setTextColor(endColor);
+                        }
+                    });
+                }
+                if (mChangeBehavior == CHANGE_BEHAVIOR_OUT_IN ||
+                        mChangeBehavior == CHANGE_BEHAVIOR_IN) {
+                    inAnim = ValueAnimator.ofInt(0, Color.alpha(endColor));
+                    inAnim.addUpdateListener(animation -> {
+                        int currAlpha = (Integer) animation.getAnimatedValue();
+                        view.setTextColor(currAlpha << 24 | endColor & 0xffffff);
+                    });
+                    inAnim.addListener(new AnimatorListenerAdapter() {
+                        @Override
+                        public void onAnimationCancel(Animator animation) {
+                            // restore opaque alpha and correct end color
+                            view.setTextColor(endColor);
+                        }
+                    });
+                }
+                if (outAnim != null && inAnim != null) {
+                    anim = new AnimatorSet();
+                    final AnimatorSet animatorSet = (AnimatorSet) anim;
+                    if (crossFade) {
+                        animatorSet.playTogether(outAnim, inAnim);
+                    } else {
+                        animatorSet.playSequentially(outAnim, inAnim);
+                    }
+                } else if (outAnim != null) {
+                    anim = outAnim;
+                } else {
+                    // Must be an in-only animation
+                    anim = inAnim;
+                }
+            }
+            TransitionListener transitionListener = new TransitionListenerAdapter() {
+                int mPausedColor = 0;
+
+                @Override
+                public void onTransitionPause(@NonNull Transition transition) {
+                    if (mChangeBehavior != CHANGE_BEHAVIOR_IN) {
+                        view.setText(endText);
+                        if (view instanceof EditText) {
+                            setSelection(((EditText) view), endSelectionStart, endSelectionEnd);
+                        }
+                    }
+                    if (mChangeBehavior > CHANGE_BEHAVIOR_KEEP) {
+                        mPausedColor = view.getCurrentTextColor();
+                        view.setTextColor(endColor);
+                    }
+                }
+
+                @Override
+                public void onTransitionResume(@NonNull Transition transition) {
+                    if (mChangeBehavior != CHANGE_BEHAVIOR_IN) {
+                        view.setText(startText);
+                        if (view instanceof EditText) {
+                            setSelection(((EditText) view), startSelectionStart, startSelectionEnd);
+                        }
+                    }
+                    if (mChangeBehavior > CHANGE_BEHAVIOR_KEEP) {
+                        view.setTextColor(mPausedColor);
+                    }
+                }
+
+                @Override
+                public void onTransitionEnd(Transition transition) {
+                    transition.removeListener(this);
+                }
+            };
+            addListener(transitionListener);
+            if (BuildConfig.DEBUG) {
+                Log.d(LOG_TAG, "createAnimator returning " + anim);
+            }
+            return anim;
+        }
+        return null;
+    }
+
+    private void setSelection(EditText editText, int start, int end) {
+        if (start >= 0 && end >= 0) {
+            editText.setSelection(start, end);
+        }
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/customviews/helpers/CustomHideBottomViewOnScrollBehavior.java b/app/src/main/java/awais/instagrabber/customviews/helpers/CustomHideBottomViewOnScrollBehavior.java
index 765fc679..dabc622b 100644
--- a/app/src/main/java/awais/instagrabber/customviews/helpers/CustomHideBottomViewOnScrollBehavior.java
+++ b/app/src/main/java/awais/instagrabber/customviews/helpers/CustomHideBottomViewOnScrollBehavior.java
@@ -1,5 +1,7 @@
 package awais.instagrabber.customviews.helpers;
 
+import android.content.Context;
+import android.util.AttributeSet;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -12,6 +14,13 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 public class CustomHideBottomViewOnScrollBehavior extends HideBottomViewOnScrollBehavior<BottomNavigationView> {
     private static final String TAG = "CustomHideBottomView";
 
+    public CustomHideBottomViewOnScrollBehavior() {
+    }
+
+    public CustomHideBottomViewOnScrollBehavior(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
     @Override
     public boolean onStartNestedScroll(@NonNull final CoordinatorLayout coordinatorLayout,
                                        @NonNull final BottomNavigationView child,
@@ -23,7 +32,13 @@ public class CustomHideBottomViewOnScrollBehavior extends HideBottomViewOnScroll
     }
 
     @Override
-    public void onNestedPreScroll(@NonNull final CoordinatorLayout coordinatorLayout, @NonNull final BottomNavigationView child, @NonNull final View target, final int dx, final int dy, @NonNull final int[] consumed, final int type) {
+    public void onNestedPreScroll(@NonNull final CoordinatorLayout coordinatorLayout,
+                                  @NonNull final BottomNavigationView child,
+                                  @NonNull final View target,
+                                  final int dx,
+                                  final int dy,
+                                  @NonNull final int[] consumed,
+                                  final int type) {
         if (dy > 0) {
             slideDown(child);
         } else if (dy < 0) {
diff --git a/app/src/main/java/awais/instagrabber/customviews/helpers/GridSpacingItemDecoration.java b/app/src/main/java/awais/instagrabber/customviews/helpers/GridSpacingItemDecoration.java
index 81b4be92..f34c30f5 100755
--- a/app/src/main/java/awais/instagrabber/customviews/helpers/GridSpacingItemDecoration.java
+++ b/app/src/main/java/awais/instagrabber/customviews/helpers/GridSpacingItemDecoration.java
@@ -7,17 +7,24 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 public class GridSpacingItemDecoration extends RecyclerView.ItemDecoration {
-    private final int spacing;
+    private final int halfSpace;
+
+    private boolean hasHeader;
 
     public GridSpacingItemDecoration(int spacing) {
-        this.spacing = spacing;
+        halfSpace = spacing / 2;
     }
 
     @Override
     public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
-        final int halfSpace = spacing / 2;
+        if (hasHeader && parent.getChildAdapterPosition(view) == 0) {
+            outRect.bottom = halfSpace;
+            outRect.left = -halfSpace;
+            outRect.right = -halfSpace;
+            return;
+        }
         if (parent.getPaddingLeft() != halfSpace) {
-            parent.setPadding(halfSpace, halfSpace, halfSpace, halfSpace);
+            parent.setPadding(halfSpace, hasHeader ? 0 : halfSpace, halfSpace, halfSpace);
             parent.setClipToPadding(false);
         }
         outRect.top = halfSpace;
@@ -25,4 +32,8 @@ public class GridSpacingItemDecoration extends RecyclerView.ItemDecoration {
         outRect.left = halfSpace;
         outRect.right = halfSpace;
     }
+
+    public void setHasHeader(final boolean hasHeader) {
+        this.hasHeader = hasHeader;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/db/AppDatabase.java b/app/src/main/java/awais/instagrabber/db/AppDatabase.java
index 63e2ce43..37446d9d 100644
--- a/app/src/main/java/awais/instagrabber/db/AppDatabase.java
+++ b/app/src/main/java/awais/instagrabber/db/AppDatabase.java
@@ -22,14 +22,16 @@ import java.util.List;
 import awais.instagrabber.db.dao.AccountDao;
 import awais.instagrabber.db.dao.DMLastNotifiedDao;
 import awais.instagrabber.db.dao.FavoriteDao;
+import awais.instagrabber.db.dao.RecentSearchDao;
 import awais.instagrabber.db.entities.Account;
 import awais.instagrabber.db.entities.DMLastNotified;
 import awais.instagrabber.db.entities.Favorite;
+import awais.instagrabber.db.entities.RecentSearch;
 import awais.instagrabber.models.enums.FavoriteType;
 import awais.instagrabber.utils.Utils;
 
-@Database(entities = {Account.class, Favorite.class, DMLastNotified.class},
-          version = 5)
+@Database(entities = {Account.class, Favorite.class, DMLastNotified.class, RecentSearch.class},
+          version = 6)
 @TypeConverters({Converters.class})
 public abstract class AppDatabase extends RoomDatabase {
     private static final String TAG = AppDatabase.class.getSimpleName();
@@ -42,12 +44,14 @@ public abstract class AppDatabase extends RoomDatabase {
 
     public abstract DMLastNotifiedDao dmLastNotifiedDao();
 
+    public abstract RecentSearchDao recentSearchDao();
+
     public static AppDatabase getDatabase(final Context context) {
         if (INSTANCE == null) {
             synchronized (AppDatabase.class) {
                 if (INSTANCE == null) {
                     INSTANCE = Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, "cookiebox.db")
-                                   .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5)
+                                   .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6)
                                    .build();
                 }
             }
@@ -156,6 +160,21 @@ public abstract class AppDatabase extends RoomDatabase {
         }
     };
 
+    static final Migration MIGRATION_5_6 = new Migration(5, 6) {
+        @Override
+        public void migrate(@NonNull final SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS `recent_searches` (" +
+                                     "`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, " +
+                                     "`ig_id` TEXT NOT NULL, " +
+                                     "`name` TEXT NOT NULL, " +
+                                     "`username` TEXT, " +
+                                     "`pic_url` TEXT, " +
+                                     "`type` TEXT NOT NULL, " +
+                                     "`last_searched_on` INTEGER NOT NULL)");
+            database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS `index_recent_searches_ig_id_type` ON `recent_searches` (`ig_id`, `type`)");
+        }
+    };
+
     @NonNull
     private static List<Favorite> backupOldFavorites(@NonNull final SupportSQLiteDatabase db) {
         // check if old favorites table had the column query_display
diff --git a/app/src/main/java/awais/instagrabber/db/dao/RecentSearchDao.java b/app/src/main/java/awais/instagrabber/db/dao/RecentSearchDao.java
new file mode 100644
index 00000000..94266524
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/db/dao/RecentSearchDao.java
@@ -0,0 +1,37 @@
+package awais.instagrabber.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.List;
+
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.models.enums.FavoriteType;
+
+@Dao
+public interface RecentSearchDao {
+
+    @Query("SELECT * FROM recent_searches ORDER BY last_searched_on DESC")
+    List<RecentSearch> getAllRecentSearches();
+
+    @Query("SELECT * FROM recent_searches WHERE `ig_id` = :igId AND `type` = :type")
+    RecentSearch getRecentSearchByIgIdAndType(String igId, FavoriteType type);
+
+    @Query("SELECT * FROM recent_searches WHERE instr(`name`, :query) > 0")
+    List<RecentSearch> findRecentSearchesWithNameContaining(String query);
+
+    @Insert
+    Long insertRecentSearch(RecentSearch recentSearch);
+
+    @Update
+    void updateRecentSearch(RecentSearch recentSearch);
+
+    @Delete
+    void deleteRecentSearch(RecentSearch recentSearch);
+
+    // @Query("DELETE from recent_searches")
+    // void deleteAllRecentSearches();
+}
diff --git a/app/src/main/java/awais/instagrabber/db/datasources/RecentSearchDataSource.java b/app/src/main/java/awais/instagrabber/db/datasources/RecentSearchDataSource.java
new file mode 100644
index 00000000..9fd950a8
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/db/datasources/RecentSearchDataSource.java
@@ -0,0 +1,57 @@
+package awais.instagrabber.db.datasources;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+import awais.instagrabber.db.AppDatabase;
+import awais.instagrabber.db.dao.RecentSearchDao;
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.models.enums.FavoriteType;
+
+public class RecentSearchDataSource {
+    private static final String TAG = RecentSearchDataSource.class.getSimpleName();
+
+    private static RecentSearchDataSource INSTANCE;
+
+    private final RecentSearchDao recentSearchDao;
+
+    private RecentSearchDataSource(final RecentSearchDao recentSearchDao) {
+        this.recentSearchDao = recentSearchDao;
+    }
+
+    public static synchronized RecentSearchDataSource getInstance(@NonNull Context context) {
+        if (INSTANCE == null) {
+            synchronized (RecentSearchDataSource.class) {
+                if (INSTANCE == null) {
+                    final AppDatabase database = AppDatabase.getDatabase(context);
+                    INSTANCE = new RecentSearchDataSource(database.recentSearchDao());
+                }
+            }
+        }
+        return INSTANCE;
+    }
+
+    public RecentSearch getRecentSearchByIgIdAndType(@NonNull final String igId, @NonNull final FavoriteType type) {
+        return recentSearchDao.getRecentSearchByIgIdAndType(igId, type);
+    }
+
+    @NonNull
+    public final List<RecentSearch> getAllRecentSearches() {
+        return recentSearchDao.getAllRecentSearches();
+    }
+
+    public final void insertOrUpdateRecentSearch(@NonNull final RecentSearch recentSearch) {
+        if (recentSearch.getId() != 0) {
+            recentSearchDao.updateRecentSearch(recentSearch);
+            return;
+        }
+        recentSearchDao.insertRecentSearch(recentSearch);
+    }
+
+    public final void deleteRecentSearch(@NonNull final RecentSearch recentSearch) {
+        recentSearchDao.deleteRecentSearch(recentSearch);
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/db/entities/RecentSearch.java b/app/src/main/java/awais/instagrabber/db/entities/RecentSearch.java
new file mode 100644
index 00000000..95bd368e
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/db/entities/RecentSearch.java
@@ -0,0 +1,185 @@
+package awais.instagrabber.db.entities;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+
+@Entity(tableName = RecentSearch.TABLE_NAME, indices = {@Index(value = {RecentSearch.COL_IG_ID, RecentSearch.COL_TYPE}, unique = true)})
+public class RecentSearch {
+    private static final String TAG = RecentSearch.class.getSimpleName();
+
+    public static final String TABLE_NAME = "recent_searches";
+    private static final String COL_ID = "id";
+    public static final String COL_IG_ID = "ig_id";
+    private static final String COL_NAME = "name";
+    private static final String COL_USERNAME = "username";
+    private static final String COL_PIC_URL = "pic_url";
+    public static final String COL_TYPE = "type";
+    private static final String COL_LAST_SEARCHED_ON = "last_searched_on";
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = COL_ID)
+    private final int id;
+
+    @ColumnInfo(name = COL_IG_ID)
+    @NonNull
+    private final String igId;
+
+    @ColumnInfo(name = COL_NAME)
+    @NonNull
+    private final String name;
+
+    @ColumnInfo(name = COL_USERNAME)
+    private final String username;
+
+    @ColumnInfo(name = COL_PIC_URL)
+    private final String picUrl;
+
+    @ColumnInfo(name = COL_TYPE)
+    @NonNull
+    private final FavoriteType type;
+
+    @ColumnInfo(name = COL_LAST_SEARCHED_ON)
+    @NonNull
+    private final LocalDateTime lastSearchedOn;
+
+    @Ignore
+    public RecentSearch(final String igId,
+                        final String name,
+                        final String username,
+                        final String picUrl,
+                        final FavoriteType type,
+                        final LocalDateTime lastSearchedOn) {
+        this(0, igId, name, username, picUrl, type, lastSearchedOn);
+    }
+
+    public RecentSearch(final int id,
+                        @NonNull final String igId,
+                        @NonNull final String name,
+                        final String username,
+                        final String picUrl,
+                        @NonNull final FavoriteType type,
+                        @NonNull final LocalDateTime lastSearchedOn) {
+        this.id = id;
+        this.igId = igId;
+        this.name = name;
+        this.username = username;
+        this.picUrl = picUrl;
+        this.type = type;
+        this.lastSearchedOn = lastSearchedOn;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    @NonNull
+    public String getIgId() {
+        return igId;
+    }
+
+    @NonNull
+    public String getName() {
+        return name;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    @NonNull
+    public FavoriteType getType() {
+        return type;
+    }
+
+    @NonNull
+    public LocalDateTime getLastSearchedOn() {
+        return lastSearchedOn;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final RecentSearch that = (RecentSearch) o;
+        return Objects.equals(igId, that.igId) &&
+                Objects.equals(name, that.name) &&
+                Objects.equals(username, that.username) &&
+                Objects.equals(picUrl, that.picUrl) &&
+                type == that.type &&
+                Objects.equals(lastSearchedOn, that.lastSearchedOn);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(igId, name, username, picUrl, type, lastSearchedOn);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "RecentSearch{" +
+                "id=" + id +
+                ", igId='" + igId + '\'' +
+                ", name='" + name + '\'' +
+                ", username='" + username + '\'' +
+                ", picUrl='" + picUrl + '\'' +
+                ", type=" + type +
+                ", lastSearchedOn=" + lastSearchedOn +
+                '}';
+    }
+
+    @Nullable
+    public static RecentSearch fromSearchItem(@NonNull final SearchItem searchItem) {
+        final FavoriteType type = searchItem.getType();
+        if (type == null) return null;
+        try {
+            final String igId;
+            final String name;
+            final String username;
+            final String picUrl;
+            switch (type) {
+                case USER:
+                    igId = String.valueOf(searchItem.getUser().getPk());
+                    name = searchItem.getUser().getFullName();
+                    username = searchItem.getUser().getUsername();
+                    picUrl = searchItem.getUser().getProfilePicUrl();
+                    break;
+                case HASHTAG:
+                    igId = searchItem.getHashtag().getId();
+                    name = searchItem.getHashtag().getName();
+                    username = null;
+                    picUrl = null;
+                    break;
+                case LOCATION:
+                    igId = String.valueOf(searchItem.getPlace().getLocation().getPk());
+                    name = searchItem.getPlace().getTitle();
+                    username = null;
+                    picUrl = null;
+                    break;
+                default:
+                    return null;
+            }
+            return new RecentSearch(igId, name, username, picUrl, type, LocalDateTime.now());
+        } catch (Exception e) {
+            Log.e(TAG, "fromSearchItem: ", e);
+        }
+        return null;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/db/repositories/RecentSearchRepository.java b/app/src/main/java/awais/instagrabber/db/repositories/RecentSearchRepository.java
new file mode 100644
index 00000000..0832a109
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/db/repositories/RecentSearchRepository.java
@@ -0,0 +1,124 @@
+package awais.instagrabber.db.repositories;
+
+import androidx.annotation.NonNull;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import awais.instagrabber.db.datasources.RecentSearchDataSource;
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.utils.AppExecutors;
+
+public class RecentSearchRepository {
+    private static final String TAG = RecentSearchRepository.class.getSimpleName();
+
+    private static RecentSearchRepository instance;
+
+    private final AppExecutors appExecutors;
+    private final RecentSearchDataSource recentSearchDataSource;
+
+    private RecentSearchRepository(final AppExecutors appExecutors, final RecentSearchDataSource recentSearchDataSource) {
+        this.appExecutors = appExecutors;
+        this.recentSearchDataSource = recentSearchDataSource;
+    }
+
+    public static RecentSearchRepository getInstance(final RecentSearchDataSource recentSearchDataSource) {
+        if (instance == null) {
+            instance = new RecentSearchRepository(AppExecutors.getInstance(), recentSearchDataSource);
+        }
+        return instance;
+    }
+
+    public void getRecentSearch(@NonNull final String igId,
+                                @NonNull final FavoriteType type,
+                                final RepositoryCallback<RecentSearch> callback) {
+        // request on the I/O thread
+        appExecutors.diskIO().execute(() -> {
+            final RecentSearch recentSearch = recentSearchDataSource.getRecentSearchByIgIdAndType(igId, type);
+            // notify on the main thread
+            appExecutors.mainThread().execute(() -> {
+                if (callback == null) return;
+                if (recentSearch == null) {
+                    callback.onDataNotAvailable();
+                    return;
+                }
+                callback.onSuccess(recentSearch);
+            });
+        });
+    }
+
+    public void getAllRecentSearches(final RepositoryCallback<List<RecentSearch>> callback) {
+        // request on the I/O thread
+        appExecutors.diskIO().execute(() -> {
+            final List<RecentSearch> recentSearches = recentSearchDataSource.getAllRecentSearches();
+            // notify on the main thread
+            appExecutors.mainThread().execute(() -> {
+                if (callback == null) return;
+                callback.onSuccess(recentSearches);
+            });
+        });
+    }
+
+    public void insertOrUpdateRecentSearch(@NonNull final RecentSearch recentSearch,
+                                           final RepositoryCallback<Void> callback) {
+        insertOrUpdateRecentSearch(recentSearch.getIgId(), recentSearch.getName(), recentSearch.getUsername(), recentSearch.getPicUrl(),
+                                   recentSearch.getType(), callback);
+    }
+
+    public void insertOrUpdateRecentSearch(@NonNull final String igId,
+                                           @NonNull final String name,
+                                           final String username,
+                                           final String picUrl,
+                                           @NonNull final FavoriteType type,
+                                           final RepositoryCallback<Void> callback) {
+        // request on the I/O thread
+        appExecutors.diskIO().execute(() -> {
+            RecentSearch recentSearch = recentSearchDataSource.getRecentSearchByIgIdAndType(igId, type);
+            recentSearch = recentSearch == null
+                           ? new RecentSearch(igId, name, username, picUrl, type, LocalDateTime.now())
+                           : new RecentSearch(recentSearch.getId(), igId, name, username, picUrl, type, LocalDateTime.now());
+            recentSearchDataSource.insertOrUpdateRecentSearch(recentSearch);
+            // notify on the main thread
+            appExecutors.mainThread().execute(() -> {
+                if (callback == null) return;
+                callback.onSuccess(null);
+            });
+        });
+    }
+
+    public void deleteRecentSearchByIgIdAndType(@NonNull final String igId,
+                                                @NonNull final FavoriteType type,
+                                                final RepositoryCallback<Void> callback) {
+        // request on the I/O thread
+        appExecutors.diskIO().execute(() -> {
+            final RecentSearch recentSearch = recentSearchDataSource.getRecentSearchByIgIdAndType(igId, type);
+            if (recentSearch != null) {
+                recentSearchDataSource.deleteRecentSearch(recentSearch);
+            }
+            // notify on the main thread
+            appExecutors.mainThread().execute(() -> {
+                if (callback == null) return;
+                if (recentSearch == null) {
+                    callback.onDataNotAvailable();
+                    return;
+                }
+                callback.onSuccess(null);
+            });
+        });
+    }
+
+    public void deleteRecentSearch(@NonNull final RecentSearch recentSearch,
+                                   final RepositoryCallback<Void> callback) {
+        // request on the I/O thread
+        appExecutors.diskIO().execute(() -> {
+
+            recentSearchDataSource.deleteRecentSearch(recentSearch);
+            // notify on the main thread
+            appExecutors.mainThread().execute(() -> {
+                if (callback == null) return;
+                callback.onSuccess(null);
+            });
+        });
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/dialogs/AccountSwitcherDialogFragment.java b/app/src/main/java/awais/instagrabber/dialogs/AccountSwitcherDialogFragment.java
index 91afa7d1..e551c66c 100644
--- a/app/src/main/java/awais/instagrabber/dialogs/AccountSwitcherDialogFragment.java
+++ b/app/src/main/java/awais/instagrabber/dialogs/AccountSwitcherDialogFragment.java
@@ -12,7 +12,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import java.util.Collections;
@@ -25,8 +24,10 @@ import awais.instagrabber.db.datasources.AccountDataSource;
 import awais.instagrabber.db.entities.Account;
 import awais.instagrabber.db.repositories.AccountRepository;
 import awais.instagrabber.db.repositories.RepositoryCallback;
+import awais.instagrabber.utils.AppExecutors;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
+import awais.instagrabber.utils.ProcessPhoenix;
 import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.utils.Utils;
 
@@ -55,9 +56,14 @@ public class AccountSwitcherDialogFragment extends DialogFragment {
         }
         CookieUtils.setupCookies(model.getCookie());
         settingsHelper.putString(Constants.COOKIE, model.getCookie());
-        final FragmentActivity activity = getActivity();
-        if (activity != null) activity.recreate();
-        dismiss();
+        // final FragmentActivity activity = getActivity();
+        // if (activity != null) activity.recreate();
+        // dismiss();
+        AppExecutors.getInstance().mainThread().execute(() -> {
+            final Context context = getContext();
+            if (context == null) return;
+            ProcessPhoenix.triggerRebirth(context);
+        }, 200);
     };
 
     private final AccountSwitcherAdapter.OnAccountLongClickListener accountLongClickListener = (model, isCurrent) -> {
diff --git a/app/src/main/java/awais/instagrabber/fragments/CollectionPostsFragment.java b/app/src/main/java/awais/instagrabber/fragments/CollectionPostsFragment.java
index 9a850045..1ca49c15 100644
--- a/app/src/main/java/awais/instagrabber/fragments/CollectionPostsFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/CollectionPostsFragment.java
@@ -190,16 +190,15 @@ public class CollectionPostsFragment extends Fragment implements SwipeRefreshLay
                                     final View profilePicView,
                                     final View mainPostImage,
                                     final int position) {
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment
-                    .builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(CollectionPostsFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
         }
     };
     private final FeedAdapterV2.SelectionModeCallback selectionModeCallback = new FeedAdapterV2.SelectionModeCallback() {
@@ -243,8 +242,10 @@ public class CollectionPostsFragment extends Fragment implements SwipeRefreshLay
         super.onCreate(savedInstanceState);
         fragmentActivity = (MainActivity) requireActivity();
         final TransitionSet transitionSet = new TransitionSet();
+        final Context context = getContext();
+        if (context == null) return;
         transitionSet.addTransition(new ChangeBounds())
-                     .addTransition(TransitionInflater.from(getContext()).inflateTransition(android.R.transition.move))
+                     .addTransition(TransitionInflater.from(context).inflateTransition(android.R.transition.move))
                      .setDuration(200);
         setSharedElementEnterTransition(transitionSet);
         postponeEnterTransition();
@@ -280,7 +281,8 @@ public class CollectionPostsFragment extends Fragment implements SwipeRefreshLay
 
     @Override
     public void onCreateOptionsMenu(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
-        inflater.inflate(R.menu.collection_posts_menu, menu);
+        // delaying to make toolbar resume animation smooth, otherwise lags
+        binding.getRoot().postDelayed(() -> inflater.inflate(R.menu.collection_posts_menu, menu), 500);
     }
 
     @Override
@@ -288,62 +290,60 @@ public class CollectionPostsFragment extends Fragment implements SwipeRefreshLay
         if (item.getItemId() == R.id.layout) {
             showPostsLayoutPreferences();
             return true;
-        }
-        else if (item.getItemId() == R.id.delete) {
+        } else if (item.getItemId() == R.id.delete) {
             final Context context = getContext();
+            if (context == null) return false;
             new AlertDialog.Builder(context)
                     .setTitle(R.string.delete_collection)
                     .setMessage(R.string.delete_collection_note)
-                    .setPositiveButton(R.string.confirm, (d, w) -> {
-                        collectionService.deleteCollection(
-                                savedCollection.getId(),
-                                new ServiceCallback<String>() {
-                                    @Override
-                                    public void onSuccess(final String result) {
-                                        SavedCollectionsFragment.pleaseRefresh = true;
-                                        NavHostFragment.findNavController(CollectionPostsFragment.this).navigateUp();
-                                    }
+                    .setPositiveButton(R.string.confirm, (d, w) -> collectionService.deleteCollection(
+                            savedCollection.getId(),
+                            new ServiceCallback<String>() {
+                                @Override
+                                public void onSuccess(final String result) {
+                                    SavedCollectionsFragment.pleaseRefresh = true;
+                                    NavHostFragment.findNavController(CollectionPostsFragment.this).navigateUp();
+                                }
 
-                                    @Override
-                                    public void onFailure(final Throwable t) {
-                                        Log.e(TAG, "Error deleting collection", t);
-                                        try {
-                                            Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                                        }
-                                        catch(final Throwable e) {}
-                                    }
-                                });
-                    })
+                                @Override
+                                public void onFailure(final Throwable t) {
+                                    Log.e(TAG, "Error deleting collection", t);
+                                    try {
+                                        final Context context = getContext();
+                                        if (context == null) return;
+                                        Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
+                                    } catch (final Throwable ignored) {}
+                                }
+                            }))
                     .setNegativeButton(R.string.cancel, null)
                     .show();
-        }
-        else if (item.getItemId() == R.id.edit) {
+        } else if (item.getItemId() == R.id.edit) {
             final Context context = getContext();
+            if (context == null) return false;
             final EditText input = new EditText(context);
             new AlertDialog.Builder(context)
                     .setTitle(R.string.edit_collection)
                     .setView(input)
-                    .setPositiveButton(R.string.confirm, (d, w) -> {
-                        collectionService.editCollectionName(
-                                savedCollection.getId(),
-                                input.getText().toString(),
-                                new ServiceCallback<String>() {
-                                    @Override
-                                    public void onSuccess(final String result) {
-                                        binding.collapsingToolbarLayout.setTitle(input.getText().toString());
-                                        SavedCollectionsFragment.pleaseRefresh = true;
-                                    }
+                    .setPositiveButton(R.string.confirm, (d, w) -> collectionService.editCollectionName(
+                            savedCollection.getId(),
+                            input.getText().toString(),
+                            new ServiceCallback<String>() {
+                                @Override
+                                public void onSuccess(final String result) {
+                                    binding.collapsingToolbarLayout.setTitle(input.getText().toString());
+                                    SavedCollectionsFragment.pleaseRefresh = true;
+                                }
 
-                                    @Override
-                                    public void onFailure(final Throwable t) {
-                                        Log.e(TAG, "Error editing collection", t);
-                                        try {
-                                            Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                                        }
-                                        catch(final Throwable e) {}
-                                    }
-                                });
-                    })
+                                @Override
+                                public void onFailure(final Throwable t) {
+                                    Log.e(TAG, "Error editing collection", t);
+                                    try {
+                                        final Context context = getContext();
+                                        if (context == null) return;
+                                        Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
+                                    } catch (final Throwable ignored) {}
+                                }
+                            }))
                     .setNegativeButton(R.string.cancel, null)
                     .show();
         }
@@ -443,8 +443,8 @@ public class CollectionPostsFragment extends Fragment implements SwipeRefreshLay
 
     private void setupCover() {
         final String coverUrl = ResponseBodyUtils.getImageUrl(savedCollection.getCoverMedias() == null
-                ? savedCollection.getCoverMedia()
-                : savedCollection.getCoverMedias().get(0));
+                                                              ? savedCollection.getCoverMedia()
+                                                              : savedCollection.getCoverMedias().get(0));
         final DraweeController controller = Fresco
                 .newDraweeControllerBuilder()
                 .setOldController(binding.cover.getController())
diff --git a/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java
deleted file mode 100644
index 6fa829a1..00000000
--- a/app/src/main/java/awais/instagrabber/fragments/CommentsViewerFragment.java
+++ /dev/null
@@ -1,487 +0,0 @@
-package awais.instagrabber.fragments;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.Resources;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextWatcher;
-import android.text.style.RelativeSizeSpan;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.LinearLayoutCompat;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.navigation.NavController;
-import androidx.navigation.NavDirections;
-import androidx.navigation.fragment.NavHostFragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import awais.instagrabber.BuildConfig;
-import awais.instagrabber.R;
-import awais.instagrabber.adapters.CommentsAdapter;
-import awais.instagrabber.asyncs.CommentsFetcher;
-import awais.instagrabber.customviews.helpers.RecyclerLazyLoader;
-import awais.instagrabber.databinding.FragmentCommentsBinding;
-import awais.instagrabber.interfaces.FetchListener;
-import awais.instagrabber.models.CommentModel;
-import awais.instagrabber.repositories.responses.User;
-import awais.instagrabber.utils.Constants;
-import awais.instagrabber.utils.CookieUtils;
-import awais.instagrabber.utils.TextUtils;
-import awais.instagrabber.utils.Utils;
-import awais.instagrabber.viewmodels.CommentsViewModel;
-import awais.instagrabber.webservices.MediaService;
-import awais.instagrabber.webservices.ServiceCallback;
-
-import static android.content.Context.INPUT_METHOD_SERVICE;
-
-public final class CommentsViewerFragment extends BottomSheetDialogFragment implements SwipeRefreshLayout.OnRefreshListener {
-    private static final String TAG = "CommentsViewerFragment";
-
-    private final String cookie = Utils.settingsHelper.getString(Constants.COOKIE);
-
-    private CommentsAdapter commentsAdapter;
-    private FragmentCommentsBinding binding;
-    private LinearLayoutManager layoutManager;
-    private RecyclerLazyLoader lazyLoader;
-    private String shortCode;
-    private long authorUserId, userIdFromCookie;
-    private String endCursor = null;
-    private Resources resources;
-    private InputMethodManager imm;
-    private AppCompatActivity fragmentActivity;
-    private LinearLayoutCompat root;
-    private boolean shouldRefresh = true, hasNextPage = false;
-    private MediaService mediaService;
-    private String postId;
-    private AsyncTask<Void, Void, List<CommentModel>> currentlyRunning;
-    private CommentsViewModel commentsViewModel;
-
-    private final FetchListener<List<CommentModel>> fetchListener = new FetchListener<List<CommentModel>>() {
-        @Override
-        public void doBefore() {
-            binding.swipeRefreshLayout.setRefreshing(true);
-        }
-
-        @Override
-        public void onResult(final List<CommentModel> commentModels) {
-            if (commentModels != null && commentModels.size() > 0) {
-                endCursor = commentModels.get(0).getEndCursor();
-                hasNextPage = commentModels.get(0).hasNextPage();
-                List<CommentModel> list = commentsViewModel.getList().getValue();
-                list = list != null ? new LinkedList<>(list) : new LinkedList<>();
-                // final int oldSize = list != null ? list.size() : 0;
-                list.addAll(commentModels);
-                commentsViewModel.getList().postValue(list);
-            }
-            binding.swipeRefreshLayout.setRefreshing(false);
-            stopCurrentExecutor(null);
-        }
-
-        @Override
-        public void onFailure(Throwable t) {
-            stopCurrentExecutor(t);
-        }
-    };
-
-    private final CommentsAdapter.CommentCallback commentCallback = new CommentsAdapter.CommentCallback() {
-        @Override
-        public void onClick(final CommentModel comment) {
-            onCommentClick(comment);
-        }
-
-        @Override
-        public void onHashtagClick(final String hashtag) {
-            final NavDirections action = CommentsViewerFragmentDirections.actionGlobalHashTagFragment(hashtag);
-            NavHostFragment.findNavController(CommentsViewerFragment.this).navigate(action);
-        }
-
-        @Override
-        public void onMentionClick(final String mention) {
-            openProfile(mention);
-        }
-
-        @Override
-        public void onURLClick(final String url) {
-            Utils.openURL(getContext(), url);
-        }
-
-        @Override
-        public void onEmailClick(final String emailAddress) {
-            Utils.openEmailAddress(getContext(), emailAddress);
-        }
-    };
-    private final View.OnClickListener newCommentListener = v -> {
-        final Editable text = binding.commentText.getText();
-        final Context context = getContext();
-        if (context == null) return;
-        if (text == null || TextUtils.isEmpty(text.toString())) {
-            Toast.makeText(context, R.string.comment_send_empty_comment, Toast.LENGTH_SHORT).show();
-            return;
-        }
-        if (userIdFromCookie == 0) return;
-        String replyToId = null;
-        final CommentModel commentModel = commentsAdapter.getSelected();
-        if (commentModel != null) {
-            replyToId = commentModel.getId();
-        }
-        mediaService.comment(postId, text.toString(), replyToId, new ServiceCallback<Boolean>() {
-            @Override
-            public void onSuccess(final Boolean result) {
-                commentsAdapter.clearSelection();
-                binding.commentText.setText("");
-                if (!result) {
-                    Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                onRefresh();
-            }
-
-            @Override
-            public void onFailure(final Throwable t) {
-                Log.e(TAG, "Error during comment", t);
-                Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-            }
-        });
-    };
-
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        fragmentActivity = (AppCompatActivity) getActivity();
-        final String deviceUuid = Utils.settingsHelper.getString(Constants.DEVICE_UUID);
-        final String csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
-        userIdFromCookie = CookieUtils.getUserIdFromCookie(cookie);
-        mediaService = MediaService.getInstance(deviceUuid, csrfToken, userIdFromCookie);
-        // setHasOptionsMenu(true);
-    }
-
-    @NonNull
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
-        if (root != null) {
-            shouldRefresh = false;
-            return root;
-        }
-        binding = FragmentCommentsBinding.inflate(getLayoutInflater());
-        binding.swipeRefreshLayout.setEnabled(false);
-        binding.swipeRefreshLayout.setNestedScrollingEnabled(false);
-        root = binding.getRoot();
-        return root;
-    }
-
-    @Override
-    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
-        if (!shouldRefresh) return;
-        init();
-        shouldRefresh = false;
-    }
-
-    // @Override
-    // public void onCreateOptionsMenu(@NonNull final Menu menu, @NonNull final MenuInflater inflater) {
-    //     inflater.inflate(R.menu.follow, menu);
-    //     menu.findItem(R.id.action_compare).setVisible(false);
-    //     final MenuItem menuSearch = menu.findItem(R.id.action_search);
-    //     final SearchView searchView = (SearchView) menuSearch.getActionView();
-    //     searchView.setQueryHint(getResources().getString(R.string.action_search));
-    //     searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-    //         @Override
-    //         public boolean onQueryTextSubmit(final String query) {
-    //             return false;
-    //         }
-    //
-    //         @Override
-    //         public boolean onQueryTextChange(final String query) {
-    //             // if (commentsAdapter != null) commentsAdapter.getFilter().filter(query);
-    //             return true;
-    //         }
-    //     });
-    // }
-
-    @Override
-    public void onRefresh() {
-        endCursor = null;
-        lazyLoader.resetState();
-        commentsViewModel.getList().postValue(Collections.emptyList());
-        stopCurrentExecutor(null);
-        currentlyRunning = new CommentsFetcher(shortCode, "", fetchListener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
-    private void init() {
-        if (getArguments() == null) return;
-        final CommentsViewerFragmentArgs fragmentArgs = CommentsViewerFragmentArgs.fromBundle(getArguments());
-        shortCode = fragmentArgs.getShortCode();
-        postId = fragmentArgs.getPostId();
-        authorUserId = fragmentArgs.getPostUserId();
-        // setTitle();
-        binding.swipeRefreshLayout.setOnRefreshListener(this);
-        binding.swipeRefreshLayout.setRefreshing(true);
-        commentsViewModel = new ViewModelProvider(this).get(CommentsViewModel.class);
-        layoutManager = new LinearLayoutManager(getContext());
-        binding.rvComments.setLayoutManager(layoutManager);
-        commentsAdapter = new CommentsAdapter(commentCallback);
-        binding.rvComments.setAdapter(commentsAdapter);
-        commentsViewModel.getList().observe(getViewLifecycleOwner(), commentsAdapter::submitList);
-        resources = getResources();
-        if (!TextUtils.isEmpty(cookie)) {
-            binding.commentField.setStartIconVisible(false);
-            binding.commentField.setEndIconVisible(false);
-            binding.commentField.setVisibility(View.VISIBLE);
-            binding.commentText.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {}
-
-                @Override
-                public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
-                    binding.commentField.setStartIconVisible(s.length() > 0);
-                    binding.commentField.setEndIconVisible(s.length() > 0);
-                }
-
-                @Override
-                public void afterTextChanged(final Editable s) {}
-            });
-            binding.commentField.setStartIconOnClickListener(v -> {
-                commentsAdapter.clearSelection();
-                binding.commentText.setText("");
-            });
-            binding.commentField.setEndIconOnClickListener(newCommentListener);
-        }
-        lazyLoader = new RecyclerLazyLoader(layoutManager, (page, totalItemsCount) -> {
-            if (hasNextPage && !TextUtils.isEmpty(endCursor))
-                currentlyRunning = new CommentsFetcher(shortCode, endCursor, fetchListener).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            endCursor = null;
-        });
-        binding.rvComments.addOnScrollListener(lazyLoader);
-        stopCurrentExecutor(null);
-        onRefresh();
-    }
-
-    // private void setTitle() {
-    //     final ActionBar actionBar = fragmentActivity.getSupportActionBar();
-    //     if (actionBar == null) return;
-    //     actionBar.setTitle(R.string.title_comments);
-    // actionBar.setSubtitle(shortCode);
-    // }
-
-    private void onCommentClick(final CommentModel commentModel) {
-        final String username = commentModel.getProfileModel().getUsername();
-        final SpannableString title = new SpannableString(username + ":\n" + commentModel.getText());
-        title.setSpan(new RelativeSizeSpan(1.23f), 0, username.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-
-        String[] commentDialogList;
-
-        if (!TextUtils.isEmpty(cookie)
-                && userIdFromCookie != 0
-                && (userIdFromCookie == commentModel.getProfileModel().getPk() || userIdFromCookie == authorUserId)) {
-            commentDialogList = new String[]{
-                    resources.getString(R.string.open_profile),
-                    resources.getString(R.string.comment_viewer_copy_comment),
-                    resources.getString(R.string.comment_viewer_see_likers),
-                    resources.getString(R.string.comment_viewer_reply_comment),
-                    commentModel.getLiked() ? resources.getString(R.string.comment_viewer_unlike_comment)
-                                            : resources.getString(R.string.comment_viewer_like_comment),
-                    resources.getString(R.string.comment_viewer_translate_comment),
-                    resources.getString(R.string.comment_viewer_delete_comment)
-            };
-        } else if (!TextUtils.isEmpty(cookie)) {
-            commentDialogList = new String[]{
-                    resources.getString(R.string.open_profile),
-                    resources.getString(R.string.comment_viewer_copy_comment),
-                    resources.getString(R.string.comment_viewer_see_likers),
-                    resources.getString(R.string.comment_viewer_reply_comment),
-                    commentModel.getLiked() ? resources.getString(R.string.comment_viewer_unlike_comment)
-                                            : resources.getString(R.string.comment_viewer_like_comment),
-                    resources.getString(R.string.comment_viewer_translate_comment)
-            };
-        } else {
-            commentDialogList = new String[]{
-                    resources.getString(R.string.open_profile),
-                    resources.getString(R.string.comment_viewer_copy_comment),
-                    resources.getString(R.string.comment_viewer_see_likers)
-            };
-        }
-        final Context context = getContext();
-        if (context == null) return;
-        final DialogInterface.OnClickListener profileDialogListener = (dialog, which) -> {
-            final User profileModel = commentModel.getProfileModel();
-            switch (which) {
-                case 0: // open profile
-                    openProfile("@" + profileModel.getUsername());
-                    break;
-                case 1: // copy comment
-                    Utils.copyText(context, "@" + profileModel.getUsername() + ": " + commentModel.getText());
-                    break;
-                case 2: // see comment likers, this is surprisingly available to anons
-                    final NavController navController = getNavController();
-                    if (navController != null) {
-                        final Bundle bundle = new Bundle();
-                        bundle.putString("postId", commentModel.getId());
-                        bundle.putBoolean("isComment", true);
-                        navController.navigate(R.id.action_global_likesViewerFragment, bundle);
-                    } else Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                    break;
-                case 3: // reply to comment
-                    commentsAdapter.setSelected(commentModel);
-                    String mention = "@" + profileModel.getUsername() + " ";
-                    binding.commentText.setText(mention);
-                    binding.commentText.requestFocus();
-                    binding.commentText.setSelection(mention.length());
-                    binding.commentText.postDelayed(() -> {
-                        imm = (InputMethodManager) context.getSystemService(INPUT_METHOD_SERVICE);
-                        if (imm == null) return;
-                        imm.showSoftInput(binding.commentText, 0);
-                    }, 200);
-                    break;
-                case 4: // like/unlike comment
-                    if (!commentModel.getLiked()) {
-                        mediaService.commentLike(commentModel.getId(), new ServiceCallback<Boolean>() {
-                            @Override
-                            public void onSuccess(final Boolean result) {
-                                if (!result) {
-                                    Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                                    return;
-                                }
-                                commentsAdapter.setLiked(commentModel, true);
-                            }
-
-                            @Override
-                            public void onFailure(final Throwable t) {
-                                Log.e(TAG, "Error liking comment", t);
-                                try {
-                                    Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                                }
-                                catch(final Throwable e) {}
-                            }
-                        });
-                        return;
-                    }
-                    mediaService.commentUnlike(commentModel.getId(), new ServiceCallback<Boolean>() {
-                        @Override
-                        public void onSuccess(final Boolean result) {
-                            if (!result) {
-                                Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-                            commentsAdapter.setLiked(commentModel, false);
-                        }
-
-                        @Override
-                        public void onFailure(final Throwable t) {
-                            Log.e(TAG, "Error unliking comment", t);
-                            try {
-                                Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                            }
-                            catch(final Throwable e) {}
-                        }
-                    });
-                    break;
-                case 5: // translate comment
-                    mediaService.translate(commentModel.getId(), "2", new ServiceCallback<String>() {
-                        @Override
-                        public void onSuccess(final String result) {
-                            if (TextUtils.isEmpty(result)) {
-                                Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                                return;
-                            }
-                            new AlertDialog.Builder(context)
-                                    .setTitle(username)
-                                    .setMessage(result)
-                                    .setPositiveButton(R.string.ok, null)
-                                    .show();
-                        }
-
-                        @Override
-                        public void onFailure(final Throwable t) {
-                            Log.e(TAG, "Error translating comment", t);
-                            try {
-                                Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                            }
-                            catch(final Throwable e) {}
-                        }
-                    });
-                    break;
-                case 6: // delete comment
-                    if (userIdFromCookie == 0) return;
-                    mediaService.deleteComment(
-                            postId, commentModel.getId(),
-                            new ServiceCallback<Boolean>() {
-                                @Override
-                                public void onSuccess(final Boolean result) {
-                                    if (!result) {
-                                        Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
-                                        return;
-                                    }
-                                    onRefresh();
-                                }
-
-                                @Override
-                                public void onFailure(final Throwable t) {
-                                    Log.e(TAG, "Error deleting comment", t);
-                                    try {
-                                        Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
-                                    }
-                                    catch(final Throwable e) {}
-                                }
-                            });
-                    break;
-            }
-        };
-        new AlertDialog.Builder(context)
-                .setTitle(title)
-                .setItems(commentDialogList, profileDialogListener)
-                .setNegativeButton(R.string.cancel, null)
-                .show();
-    }
-
-    private void openProfile(final String username) {
-        final NavDirections action = CommentsViewerFragmentDirections.actionGlobalProfileFragment(username);
-        NavHostFragment.findNavController(this).navigate(action);
-    }
-
-    private void stopCurrentExecutor(final Throwable t) {
-        if (currentlyRunning != null) {
-            try {
-                currentlyRunning.cancel(true);
-            } catch (final Exception e) {
-                if (BuildConfig.DEBUG) Log.e(TAG, "", e);
-            }
-        }
-        if (t != null) {
-            try {
-                Toast.makeText(getContext(), t.getMessage(), Toast.LENGTH_SHORT).show();
-                binding.swipeRefreshLayout.setRefreshing(false);
-            }
-            catch(Throwable e) {}
-        }
-    }
-
-    @Nullable
-    private NavController getNavController() {
-        NavController navController = null;
-        try {
-            navController = NavHostFragment.findNavController(this);
-        } catch (IllegalStateException e) {
-            Log.e(TAG, "navigateToProfile", e);
-        }
-        return navController;
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/fragments/FavoritesFragment.java b/app/src/main/java/awais/instagrabber/fragments/FavoritesFragment.java
index 7be4156c..975357e8 100644
--- a/app/src/main/java/awais/instagrabber/fragments/FavoritesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/FavoritesFragment.java
@@ -41,7 +41,9 @@ public class FavoritesFragment extends Fragment {
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(getContext()));
+        final Context context = getContext();
+        if (context == null) return;
+        favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(context));
     }
 
     @NonNull
diff --git a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
index 81530dc5..d8ac1c2a 100644
--- a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
@@ -1,5 +1,6 @@
 package awais.instagrabber.fragments;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
@@ -23,12 +24,14 @@ import androidx.activity.OnBackPressedDispatcher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.constraintlayout.motion.widget.MotionLayout;
+import androidx.constraintlayout.motion.widget.MotionScene;
 import androidx.core.content.PermissionChecker;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.snackbar.BaseTransientBottomBar;
@@ -60,6 +63,7 @@ import awais.instagrabber.repositories.requests.StoryViewerOptions;
 import awais.instagrabber.repositories.responses.Hashtag;
 import awais.instagrabber.repositories.responses.Location;
 import awais.instagrabber.repositories.responses.Media;
+import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
 import awais.instagrabber.utils.DownloadUtils;
@@ -74,9 +78,6 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission;
 import static awais.instagrabber.utils.DownloadUtils.WRITE_PERMISSION;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
-//import awaisomereport.LogCollector;
-//import static awais.instagrabber.utils.Utils.logCollector;
-
 public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
     private static final String TAG = "HashTagFragment";
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
@@ -86,7 +87,7 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
 
     private MainActivity fragmentActivity;
     private FragmentHashtagBinding binding;
-    private CoordinatorLayout root;
+    private MotionLayout root;
     private boolean shouldRefresh = true;
     private boolean hasStories = false;
     private boolean opening = false;
@@ -213,7 +214,9 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
                                     final View mainPostImage,
                                     final int position) {
             if (opening) return;
-            if (TextUtils.isEmpty(feedModel.getUser().getUsername())) {
+            final User user = feedModel.getUser();
+            if (user == null) return;
+            if (TextUtils.isEmpty(user.getUsername())) {
                 opening = true;
                 new PostFetcher(feedModel.getCode(), newFeedModel -> {
                     opening = false;
@@ -223,15 +226,15 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
                 return;
             }
             opening = true;
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment.builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(HashTagFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
             opening = false;
         }
     };
@@ -301,13 +304,11 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
     public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
         if (root != null) {
             shouldRefresh = false;
-            fragmentActivity.setCollapsingView(hashtagDetailsBinding.getRoot());
             return root;
         }
         binding = FragmentHashtagBinding.inflate(inflater, container, false);
         root = binding.getRoot();
-        hashtagDetailsBinding = LayoutHashtagDetailsBinding.inflate(inflater, fragmentActivity.getCollapsingToolbarView(), false);
-        fragmentActivity.setCollapsingView(hashtagDetailsBinding.getRoot());
+        hashtagDetailsBinding = binding.header;
         return root;
     }
 
@@ -364,14 +365,6 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        if (hashtagDetailsBinding != null) {
-            fragmentActivity.removeCollapsingView(hashtagDetailsBinding.getRoot());
-        }
-    }
-
     private void init() {
         if (getArguments() == null) return;
         final HashTagFragmentArgs fragmentArgs = HashTagFragmentArgs.fromBundle(getArguments());
@@ -396,6 +389,17 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
                      .setSelectionModeCallback(selectionModeCallback)
                      .init();
         binding.swipeRefreshLayout.setRefreshing(true);
+        binding.posts.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                final boolean canScrollVertically = recyclerView.canScrollVertically(-1);
+                final MotionScene.Transition transition = root.getTransition(R.id.transition);
+                if (transition != null) {
+                    transition.setEnable(!canScrollVertically);
+                }
+            }
+        });
     }
 
     private void setHashtagDetails() {
@@ -403,8 +407,7 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
             try {
                 Toast.makeText(getContext(), R.string.error_loading_hashtag, Toast.LENGTH_SHORT).show();
                 binding.swipeRefreshLayout.setEnabled(false);
-            }
-            catch (Exception ignored) {}
+            } catch (Exception ignored) {}
             return;
         }
         setTitle();
@@ -423,47 +426,49 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
                 final String csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
                 final long userId = CookieUtils.getUserIdFromCookie(cookie);
                 final String deviceUuid = Utils.settingsHelper.getString(Constants.DEVICE_UUID);
-                if (csrfToken != null && userId != 0 && deviceUuid != null) {
+                if (csrfToken != null && userId != 0) {
                     hashtagDetailsBinding.btnFollowTag.setClickable(false);
-                    tagsService.changeFollow(hashtagModel.getFollowing() == FollowingType.FOLLOWING ? "unfollow" : "follow",
-                                             hashtag,
-                                             csrfToken,
-                                             userId,
-                                             deviceUuid,
-                                             new ServiceCallback<Boolean>() {
-                        @Override
-                        public void onSuccess(final Boolean result) {
-                            hashtagDetailsBinding.btnFollowTag.setClickable(true);
-                            if (!result) {
-                                Log.e(TAG, "onSuccess: result is false");
-                                Snackbar.make(root, R.string.downloader_unknown_error, BaseTransientBottomBar.LENGTH_LONG)
-                                        .show();
-                                return;
-                            }
-                            hashtagDetailsBinding.btnFollowTag.setText(R.string.unfollow);
-                            hashtagDetailsBinding.btnFollowTag.setChipIconResource(R.drawable.ic_outline_person_add_disabled_24);
-                        }
+                    tagsService.changeFollow(
+                            hashtagModel.getFollowing() == FollowingType.FOLLOWING ? "unfollow" : "follow",
+                            hashtag,
+                            csrfToken,
+                            userId,
+                            deviceUuid,
+                            new ServiceCallback<Boolean>() {
+                                @Override
+                                public void onSuccess(final Boolean result) {
+                                    hashtagDetailsBinding.btnFollowTag.setClickable(true);
+                                    if (!result) {
+                                        Log.e(TAG, "onSuccess: result is false");
+                                        Snackbar.make(root, R.string.downloader_unknown_error, BaseTransientBottomBar.LENGTH_LONG)
+                                                .show();
+                                        return;
+                                    }
+                                    hashtagDetailsBinding.btnFollowTag.setText(R.string.unfollow);
+                                    hashtagDetailsBinding.btnFollowTag.setChipIconResource(R.drawable.ic_outline_person_add_disabled_24);
+                                }
 
-                        @Override
-                        public void onFailure(@NonNull final Throwable t) {
-                            hashtagDetailsBinding.btnFollowTag.setClickable(true);
-                            Log.e(TAG, "onFailure: ", t);
-                            final String message = t.getMessage();
-                            Snackbar.make(root,
-                                          message != null ? message
-                                                          : getString(R.string.downloader_unknown_error),
-                                          BaseTransientBottomBar.LENGTH_LONG)
-                                    .show();
-                        }
-                    });
-                    return;
+                                @Override
+                                public void onFailure(@NonNull final Throwable t) {
+                                    hashtagDetailsBinding.btnFollowTag.setClickable(true);
+                                    Log.e(TAG, "onFailure: ", t);
+                                    final String message = t.getMessage();
+                                    Snackbar.make(
+                                            root,
+                                            message != null ? message : getString(R.string.downloader_unknown_error),
+                                            BaseTransientBottomBar.LENGTH_LONG)
+                                            .show();
+                                }
+                            });
                 }
             });
         } else {
             hashtagDetailsBinding.btnFollowTag.setVisibility(View.GONE);
         }
         hashtagDetailsBinding.favChip.setVisibility(View.VISIBLE);
-        final FavoriteRepository favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(getContext()));
+        final Context context = getContext();
+        if (context == null) return;
+        final FavoriteRepository favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(context));
         favoriteRepository.getFavorite(hashtag, FavoriteType.HASHTAG, new RepositoryCallback<Favorite>() {
             @Override
             public void onSuccess(final Favorite result) {
@@ -552,7 +557,7 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
     }
 
     private void showSnackbar(final String message) {
-        final Snackbar snackbar = Snackbar.make(root, message, BaseTransientBottomBar.LENGTH_LONG);
+        @SuppressLint("ShowToast") final Snackbar snackbar = Snackbar.make(root, message, BaseTransientBottomBar.LENGTH_LONG);
         snackbar.setAction(R.string.ok, v1 -> snackbar.dismiss())
                 .setAnimationMode(BaseTransientBottomBar.ANIMATION_MODE_SLIDE)
                 .setAnchorView(fragmentActivity.getBottomNavView())
diff --git a/app/src/main/java/awais/instagrabber/fragments/LikesViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/LikesViewerFragment.java
index f2c12d91..c1f41568 100644
--- a/app/src/main/java/awais/instagrabber/fragments/LikesViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/LikesViewerFragment.java
@@ -11,6 +11,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
@@ -34,7 +35,7 @@ import awais.instagrabber.webservices.ServiceCallback;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
 public final class LikesViewerFragment extends BottomSheetDialogFragment implements SwipeRefreshLayout.OnRefreshListener {
-    private static final String TAG = "LikesViewerFragment";
+    private static final String TAG = LikesViewerFragment.class.getSimpleName();
 
     private FragmentLikesBinding binding;
     private RecyclerLazyLoader lazyLoader;
@@ -58,6 +59,7 @@ public final class LikesViewerFragment extends BottomSheetDialogFragment impleme
             });
             binding.rvLikes.setAdapter(likesAdapter);
             binding.rvLikes.setLayoutManager(new LinearLayoutManager(getContext()));
+            binding.rvLikes.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL));
             binding.swipeRefreshLayout.setRefreshing(false);
         }
 
@@ -71,7 +73,7 @@ public final class LikesViewerFragment extends BottomSheetDialogFragment impleme
         }
     };
 
-    private final ServiceCallback<GraphQLUserListFetchResponse> acb = new ServiceCallback<GraphQLUserListFetchResponse>() {
+    private final ServiceCallback<GraphQLUserListFetchResponse> anonCb = new ServiceCallback<GraphQLUserListFetchResponse>() {
         @Override
         public void onSuccess(final GraphQLUserListFetchResponse result) {
             endCursor = result.getNextMaxId();
@@ -127,7 +129,7 @@ public final class LikesViewerFragment extends BottomSheetDialogFragment impleme
     public void onRefresh() {
         if (isComment && !isLoggedIn) {
             lazyLoader.resetState();
-            graphQLService.fetchCommentLikers(postId, null, acb);
+            graphQLService.fetchCommentLikers(postId, null, anonCb);
         } else mediaService.fetchLikes(postId, isComment, cb);
     }
 
@@ -141,9 +143,10 @@ public final class LikesViewerFragment extends BottomSheetDialogFragment impleme
         if (isComment && !isLoggedIn) {
             final LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
             binding.rvLikes.setLayoutManager(layoutManager);
+            binding.rvLikes.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.HORIZONTAL));
             lazyLoader = new RecyclerLazyLoader(layoutManager, (page, totalItemsCount) -> {
                 if (!TextUtils.isEmpty(endCursor))
-                    graphQLService.fetchCommentLikers(postId, endCursor, acb);
+                    graphQLService.fetchCommentLikers(postId, endCursor, anonCb);
                 endCursor = null;
             });
             binding.rvLikes.addOnScrollListener(lazyLoader);
diff --git a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
index c42809c5..9f6da2c0 100644
--- a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
@@ -1,5 +1,6 @@
 package awais.instagrabber.fragments;
 
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -21,12 +22,14 @@ import androidx.activity.OnBackPressedDispatcher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.constraintlayout.motion.widget.MotionLayout;
+import androidx.constraintlayout.motion.widget.MotionScene;
 import androidx.core.content.PermissionChecker;
 import androidx.fragment.app.Fragment;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.snackbar.BaseTransientBottomBar;
@@ -56,6 +59,7 @@ import awais.instagrabber.models.enums.FavoriteType;
 import awais.instagrabber.repositories.requests.StoryViewerOptions;
 import awais.instagrabber.repositories.responses.Location;
 import awais.instagrabber.repositories.responses.Media;
+import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
 import awais.instagrabber.utils.DownloadUtils;
@@ -70,9 +74,6 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission;
 import static awais.instagrabber.utils.DownloadUtils.WRITE_PERMISSION;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
-//import awaisomereport.LogCollector;
-//import static awais.instagrabber.utils.Utils.logCollector;
-
 public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
     private static final String TAG = "LocationFragment";
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
@@ -80,7 +81,7 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
 
     private MainActivity fragmentActivity;
     private FragmentLocationBinding binding;
-    private CoordinatorLayout root;
+    private MotionLayout root;
     private boolean shouldRefresh = true;
     private boolean hasStories = false;
     private boolean opening = false;
@@ -204,7 +205,9 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
                                     final View mainPostImage,
                                     final int position) {
             if (opening) return;
-            if (TextUtils.isEmpty(feedModel.getUser().getUsername())) {
+            final User user = feedModel.getUser();
+            if (user == null) return;
+            if (TextUtils.isEmpty(user.getUsername())) {
                 opening = true;
                 new PostFetcher(feedModel.getCode(), newFeedModel -> {
                     opening = false;
@@ -214,16 +217,15 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
                 return;
             }
             opening = true;
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment
-                    .builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(LocationFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
             opening = false;
         }
     };
@@ -295,13 +297,11 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
                              @Nullable final Bundle savedInstanceState) {
         if (root != null) {
             shouldRefresh = false;
-            fragmentActivity.setCollapsingView(locationDetailsBinding.getRoot());
             return root;
         }
         binding = FragmentLocationBinding.inflate(inflater, container, false);
         root = binding.getRoot();
-        locationDetailsBinding = LayoutLocationDetailsBinding.inflate(inflater, fragmentActivity.getCollapsingToolbarView(), false);
-        fragmentActivity.setCollapsingView(locationDetailsBinding.getRoot());
+        locationDetailsBinding = binding.header;
         return root;
     }
 
@@ -358,14 +358,6 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        if (locationDetailsBinding != null) {
-            fragmentActivity.removeCollapsingView(locationDetailsBinding.getRoot());
-        }
-    }
-
     private void init() {
         if (getArguments() == null) return;
         final LocationFragmentArgs fragmentArgs = LocationFragmentArgs.fromBundle(getArguments());
@@ -386,6 +378,17 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
                      .setSelectionModeCallback(selectionModeCallback)
                      .init();
         binding.swipeRefreshLayout.setRefreshing(true);
+        binding.posts.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                final boolean canScrollVertically = recyclerView.canScrollVertically(-1);
+                final MotionScene.Transition transition = root.getTransition(R.id.transition);
+                if (transition != null) {
+                    transition.setEnable(!canScrollVertically);
+                }
+            }
+        });
     }
 
     private void fetchLocationModel() {
@@ -399,8 +402,7 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
             try {
                 Toast.makeText(getContext(), R.string.error_loading_location, Toast.LENGTH_SHORT).show();
                 binding.swipeRefreshLayout.setEnabled(false);
-            }
-            catch (Exception ignored) {}
+            } catch (Exception ignored) {}
             return;
         }
         setTitle();
@@ -409,16 +411,16 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
         final long locationId = locationModel.getPk();
         // binding.swipeRefreshLayout.setRefreshing(true);
         locationDetailsBinding.mainLocationImage.setImageURI("res:/" + R.drawable.ic_location);
-//        final String postCount = String.valueOf(locationModel.getCount());
-//        final SpannableStringBuilder span = new SpannableStringBuilder(getResources().getQuantityString(R.plurals.main_posts_count_inline,
-//                                                                                                        locationModel.getPostCount() > 2000000000L
-//                                                                                                        ? 2000000000
-//                                                                                                        : locationModel.getPostCount().intValue(),
-//                                                                                                        postCount));
-//        span.setSpan(new RelativeSizeSpan(1.2f), 0, postCount.length(), 0);
-//        span.setSpan(new StyleSpan(Typeface.BOLD), 0, postCount.length(), 0);
-//        locationDetailsBinding.mainLocPostCount.setText(span);
-//        locationDetailsBinding.mainLocPostCount.setVisibility(View.VISIBLE);
+        // final String postCount = String.valueOf(locationModel.getCount());
+        // final SpannableStringBuilder span = new SpannableStringBuilder(getResources().getQuantityString(R.plurals.main_posts_count_inline,
+        //                                                                                                 locationModel.getPostCount() > 2000000000L
+        //                                                                                                 ? 2000000000
+        //                                                                                                 : locationModel.getPostCount().intValue(),
+        //                                                                                                 postCount));
+        // span.setSpan(new RelativeSizeSpan(1.2f), 0, postCount.length(), 0);
+        // span.setSpan(new StyleSpan(Typeface.BOLD), 0, postCount.length(), 0);
+        // locationDetailsBinding.mainLocPostCount.setText(span);
+        // locationDetailsBinding.mainLocPostCount.setVisibility(View.VISIBLE);
         locationDetailsBinding.locationFullName.setText(locationModel.getName());
         CharSequence biography = locationModel.getAddress() + "\n" + locationModel.getCity();
         // binding.locationBiography.setCaptionIsExpandable(true);
@@ -431,22 +433,22 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
         } else {
             locationDetailsBinding.locationBiography.setVisibility(View.VISIBLE);
             locationDetailsBinding.locationBiography.setText(biography);
-//            locationDetailsBinding.locationBiography.addOnHashtagListener(autoLinkItem -> {
-//                final NavController navController = NavHostFragment.findNavController(this);
-//                final Bundle bundle = new Bundle();
-//                final String originalText = autoLinkItem.getOriginalText().trim();
-//                bundle.putString(ARG_HASHTAG, originalText);
-//                navController.navigate(R.id.action_global_hashTagFragment, bundle);
-//            });
-//            locationDetailsBinding.locationBiography.addOnMentionClickListener(autoLinkItem -> {
-//                final String originalText = autoLinkItem.getOriginalText().trim();
-//                navigateToProfile(originalText);
-//            });
-//            locationDetailsBinding.locationBiography.addOnEmailClickListener(autoLinkItem -> Utils.openEmailAddress(context,
-//                                                                                                                    autoLinkItem.getOriginalText()
-//                                                                                                                                .trim()));
-//            locationDetailsBinding.locationBiography
-//                    .addOnURLClickListener(autoLinkItem -> Utils.openURL(context, autoLinkItem.getOriginalText().trim()));
+            // locationDetailsBinding.locationBiography.addOnHashtagListener(autoLinkItem -> {
+            //     final NavController navController = NavHostFragment.findNavController(this);
+            //     final Bundle bundle = new Bundle();
+            //     final String originalText = autoLinkItem.getOriginalText().trim();
+            //     bundle.putString(ARG_HASHTAG, originalText);
+            //     navController.navigate(R.id.action_global_hashTagFragment, bundle);
+            // });
+            // locationDetailsBinding.locationBiography.addOnMentionClickListener(autoLinkItem -> {
+            //     final String originalText = autoLinkItem.getOriginalText().trim();
+            //     navigateToProfile(originalText);
+            // });
+            // locationDetailsBinding.locationBiography.addOnEmailClickListener(autoLinkItem -> Utils.openEmailAddress(context,
+            //                                                                                                         autoLinkItem.getOriginalText()
+            //                                                                                                                     .trim()));
+            // locationDetailsBinding.locationBiography
+            //         .addOnURLClickListener(autoLinkItem -> Utils.openURL(context, autoLinkItem.getOriginalText().trim()));
             locationDetailsBinding.locationBiography.setOnLongClickListener(v -> {
                 Utils.copyText(context, biography);
                 return true;
@@ -456,9 +458,16 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
         if (!locationModel.getGeo().startsWith("geo:0.0,0.0?z=17")) {
             locationDetailsBinding.btnMap.setVisibility(View.VISIBLE);
             locationDetailsBinding.btnMap.setOnClickListener(v -> {
-                final Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(locationModel.getGeo()));
-                startActivity(intent);
+                try {
+                    final Intent intent = new Intent(Intent.ACTION_VIEW);
+                    intent.setData(Uri.parse(locationModel.getGeo()));
+                    startActivity(intent);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(context, R.string.no_external_map_app, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "setupLocationDetails: ", e);
+                } catch (Exception e) {
+                    Log.e(TAG, "setupLocationDetails: ", e);
+                }
             });
         } else {
             locationDetailsBinding.btnMap.setVisibility(View.GONE);
diff --git a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
index 15d5306d..c443652b 100644
--- a/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/NotificationsViewerFragment.java
@@ -20,6 +20,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -93,12 +94,12 @@ public final class NotificationsViewerFragment extends Fragment implements Swipe
             final NotificationImage notificationImage = model.getArgs().getMedia().get(0);
             final long mediaId = Long.parseLong(notificationImage.getId().split("_")[0]);
             if (model.getType() == NotificationType.RESPONDED_STORY) {
-                final NavDirections action = NotificationsViewerFragmentDirections
-                        .actionNotificationsToStory(
-                                StoryViewerOptions.forStory(
-                                        mediaId,
-                                        model.getArgs().getUsername()));
-                NavHostFragment.findNavController(NotificationsViewerFragment.this).navigate(action);
+                final StoryViewerOptions options = StoryViewerOptions.forStory(
+                        mediaId,
+                        model.getArgs().getUsername());
+                final Bundle bundle = new Bundle();
+                bundle.putSerializable("options", options);
+                NavHostFragment.findNavController(NotificationsViewerFragment.this).navigate(R.id.action_notifications_to_story, bundle);
             } else {
                 final AlertDialog alertDialog = new AlertDialog.Builder(context)
                         .setCancelable(false)
@@ -108,11 +109,14 @@ public final class NotificationsViewerFragment extends Fragment implements Swipe
                 mediaService.fetch(mediaId, new ServiceCallback<Media>() {
                     @Override
                     public void onSuccess(final Media feedModel) {
-                        final PostViewV2Fragment fragment = PostViewV2Fragment
-                                .builder(feedModel)
-                                .build();
-                        fragment.setOnShowListener(dialog -> alertDialog.dismiss());
-                        fragment.show(getChildFragmentManager(), "post_view");
+                        final NavController navController = NavHostFragment.findNavController(NotificationsViewerFragment.this);
+                        final Bundle bundle = new Bundle();
+                        bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+                        try {
+                            navController.navigate(R.id.action_global_post_view, bundle);
+                        } catch (Exception e) {
+                            Log.e(TAG, "onSuccess: ", e);
+                        }
                     }
 
                     @Override
diff --git a/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java b/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java
index 0d0c7865..65315e35 100644
--- a/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/PostViewV2Fragment.java
@@ -1,52 +1,35 @@
 package awais.instagrabber.fragments;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.graphics.drawable.Animatable;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.util.Log;
-import android.view.GestureDetector;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.ScrollView;
 import android.widget.Toast;
-import android.widget.ViewSwitcher;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.PermissionChecker;
-import androidx.core.view.ViewCompat;
-import androidx.core.widget.NestedScrollView;
-import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
@@ -60,30 +43,42 @@ import androidx.transition.TransitionManager;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.drawable.ScalingUtils;
-import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.interfaces.DraweeController;
-import com.facebook.imagepipeline.image.ImageInfo;
 import com.facebook.imagepipeline.request.ImageRequest;
 import com.facebook.imagepipeline.request.ImageRequestBuilder;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.android.material.snackbar.BaseTransientBottomBar;
 import com.google.android.material.snackbar.Snackbar;
+import com.skydoves.balloon.ArrowOrientation;
+import com.skydoves.balloon.ArrowPositionRules;
+import com.skydoves.balloon.Balloon;
+import com.skydoves.balloon.BalloonAnimation;
+import com.skydoves.balloon.BalloonHighlightAnimation;
+import com.skydoves.balloon.BalloonSizeSpec;
+import com.skydoves.balloon.overlay.BalloonOverlayAnimation;
+import com.skydoves.balloon.overlay.BalloonOverlayCircle;
 
 import java.io.Serializable;
 import java.util.List;
 
 import awais.instagrabber.R;
+import awais.instagrabber.activities.MainActivity;
 import awais.instagrabber.adapters.SliderCallbackAdapter;
 import awais.instagrabber.adapters.SliderItemsAdapter;
 import awais.instagrabber.adapters.viewholder.SliderVideoViewHolder;
-import awais.instagrabber.customviews.SharedElementTransitionDialogFragment;
 import awais.instagrabber.customviews.VerticalImageSpan;
 import awais.instagrabber.customviews.VideoPlayerCallbackAdapter;
 import awais.instagrabber.customviews.VideoPlayerViewHelper;
 import awais.instagrabber.customviews.drawee.AnimatedZoomableController;
+import awais.instagrabber.customviews.drawee.DoubleTapGestureListener;
+import awais.instagrabber.customviews.drawee.ZoomableController;
+import awais.instagrabber.customviews.drawee.ZoomableDraweeView;
 import awais.instagrabber.databinding.DialogPostViewBinding;
+import awais.instagrabber.databinding.LayoutPostViewBottomBinding;
+import awais.instagrabber.databinding.LayoutVideoPlayerWithThumbnailBinding;
 import awais.instagrabber.dialogs.EditTextDialogFragment;
 import awais.instagrabber.models.Resource;
 import awais.instagrabber.models.enums.MediaItemType;
@@ -94,6 +89,7 @@ import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.repositories.responses.VideoVersion;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.DownloadUtils;
+import awais.instagrabber.utils.NullSafePair;
 import awais.instagrabber.utils.NumberUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 import awais.instagrabber.utils.TextUtils;
@@ -102,38 +98,39 @@ import awais.instagrabber.viewmodels.PostViewV2ViewModel;
 
 import static androidx.core.content.PermissionChecker.checkSelfPermission;
 import static awais.instagrabber.fragments.HashTagFragment.ARG_HASHTAG;
+import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_SHOWN_COUNT_TOOLTIP;
 import static awais.instagrabber.utils.DownloadUtils.WRITE_PERMISSION;
+import static awais.instagrabber.utils.Utils.getAttrValue;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
-public class PostViewV2Fragment extends SharedElementTransitionDialogFragment implements EditTextDialogFragment.EditTextDialogFragmentCallback {
+public class PostViewV2Fragment extends Fragment implements EditTextDialogFragment.EditTextDialogFragmentCallback {
     private static final String TAG = "PostViewV2Fragment";
-    private static final int DETAILS_HIDE_DELAY_MILLIS = 2000;
-    private static final String ARG_MEDIA = "media";
-    private static final String ARG_SLIDER_POSITION = "position";
+    // private static final int DETAILS_HIDE_DELAY_MILLIS = 2000;
+    public static final String ARG_MEDIA = "media";
+    public static final String ARG_SLIDER_POSITION = "position";
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
 
-    // private Media media;
-    private View sharedProfilePicElement;
-    private View sharedMainPostElement;
     private DialogPostViewBinding binding;
-    // private MediaService mediaService;
-    private Context context;
-    private BottomSheetBehavior<NestedScrollView> bottomSheetBehavior;
-    private boolean detailsVisible = true, video;
+    private boolean detailsVisible = true;
+    private boolean video;
     private VideoPlayerViewHelper videoPlayerViewHelper;
     private SliderItemsAdapter sliderItemsAdapter;
-    private boolean wasControlsVisible;
-    private boolean wasPaused;
-    private int captionState = BottomSheetBehavior.STATE_HIDDEN;
     private int sliderPosition = -1;
-    private DialogInterface.OnShowListener onShowListener;
-    private boolean hasBeenToggled = false;
     private PostViewV2ViewModel viewModel;
     private PopupMenu optionsPopup;
     private EditTextDialogFragment editTextDialogFragment;
     private boolean wasDeleted;
     private MutableLiveData<Object> backStackSavedStateResultLiveData;
     private OnDeleteListener onDeleteListener;
+    @Nullable
+    private ViewPager2 sliderParent;
+    private LayoutPostViewBottomBinding bottom;
+    private View postView;
+    private int originalHeight;
+    private int originalSystemUi;
+    private boolean isInFullScreenMode;
+    private StyledPlayerView playerView;
+    private int playerViewOriginalHeight;
 
     private final Observer<Object> backStackSavedStateObserver = result -> {
         if (result == null) return;
@@ -144,58 +141,7 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         // clear result
         backStackSavedStateResultLiveData.postValue(null);
     };
-    private final GestureDetector.OnGestureListener videoPlayerViewGestureListener = new GestureDetector.SimpleOnGestureListener() {
-        @Override
-        public boolean onSingleTapConfirmed(final MotionEvent e) {
-            binding.videoPost.playerView.performClick();
-            return true;
-        }
-    };
-
-    // private final VerticalDragHelper.OnVerticalDragListener onVerticalDragListener = new VerticalDragHelper.OnVerticalDragListener() {
-    //
-    //     @Override
-    //     public void onDrag(final float dY) {
-    //         // allow the view to be draggable
-    //         final ConstraintLayout v = binding.getRoot();
-    //         final float finalY = v.getY() + dY;
-    //         animateY(v, finalY, 0, null);
-    //     }
-    //
-    //     @Override
-    //     public void onDragEnd() {
-    //         // animate and dismiss if user drags the view more that 30% of the view
-    //         if (Math.abs(binding.getRoot().getY()) > Utils.displayMetrics.heightPixels * 0.25) {
-    //             animateAndDismiss(binding.getRoot().getY() < 0 ? 1 : -1);
-    //             return;
-    //         }
-    //         // animate back the view to proper position
-    //         animateY(binding.getRoot(), 0, 200, null);
-    //     }
-    //
-    //     @Override
-    //     public void onFling(final double flingVelocity) {
-    //         // animate and dismiss if user flings up/down
-    //         animateAndDismiss(flingVelocity > 0 ? 1 : -1);
-    //     }
-    //
-    //     private void animateAndDismiss(final int direction) {
-    //         final int height = binding.getRoot().getHeight();
-    //         final int finalYDist = height + Utils.getStatusBarHeight(context);
-    //         // less than 0 means up direction, else down
-    //         final int finalY = direction > 0 ? -finalYDist : finalYDist;
-    //         animateY(binding.getRoot(), finalY, 200, new AnimatorListenerAdapter() {
-    //             @Override
-    //             public void onAnimationEnd(final Animator animation) {
-    //                 dismiss();
-    //             }
-    //         });
-    //     }
-    // };
-
-    public void setOnShowListener(final DialogInterface.OnShowListener onShowListener) {
-        this.onShowListener = onShowListener;
-    }
+    private Drawable originalRootBackground;
 
     public void setOnDeleteListener(final OnDeleteListener onDeleteListener) {
         if (onDeleteListener == null) return;
@@ -206,71 +152,13 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         void onDelete();
     }
 
-    public static class Builder {
-        private final Media feedModel;
-        private View profilePicElement;
-        private View mainPostElement;
-        private int position;
-
-        public Builder setSharedProfilePicElement(final View profilePicElement) {
-            this.profilePicElement = profilePicElement;
-            return this;
-        }
-
-        @SuppressWarnings("UnusedReturnValue")
-        public Builder setSharedMainPostElement(final View mainPostElement) {
-            this.mainPostElement = mainPostElement;
-            return this;
-        }
-
-        public Builder setPosition(final int position) {
-            this.position = position;
-            return this;
-        }
-
-        public PostViewV2Fragment build() {
-            return PostViewV2Fragment.newInstance(feedModel, profilePicElement, mainPostElement, position);
-        }
-
-        public Builder(final Media feedModel) {
-            this.feedModel = feedModel;
-        }
-    }
-
-    private static PostViewV2Fragment newInstance(final Media feedModel,
-                                                  final View profilePicElement,
-                                                  final View mainPostElement,
-                                                  final int position) {
-        final PostViewV2Fragment f = new PostViewV2Fragment(profilePicElement, mainPostElement);
-        final Bundle args = new Bundle();
-        args.putSerializable(ARG_MEDIA, feedModel);
-        if (position >= 0) {
-            args.putInt(ARG_SLIDER_POSITION, position);
-        }
-        f.setArguments(args);
-        return f;
-    }
-
-    public static Builder builder(final Media feedModel) {
-        return new Builder(feedModel);
-    }
-
     // default constructor for fragment manager
     public PostViewV2Fragment() {}
 
-    private PostViewV2Fragment(final View sharedProfilePicElement,
-                               final View sharedMainPostElement) {
-        this.sharedProfilePicElement = sharedProfilePicElement;
-        this.sharedMainPostElement = sharedMainPostElement;
-    }
-
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setStyle(DialogFragment.STYLE_NO_FRAME, R.style.PostViewV2Style);
         viewModel = new ViewModelProvider(this).get(PostViewV2ViewModel.class);
-        captionState = settingsHelper.getBoolean(Constants.SHOW_CAPTIONS) ?
-                       BottomSheetBehavior.STATE_COLLAPSED : BottomSheetBehavior.STATE_HIDDEN;
     }
 
     @Nullable
@@ -279,61 +167,21 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                              @Nullable final ViewGroup container,
                              @Nullable final Bundle savedInstanceState) {
         binding = DialogPostViewBinding.inflate(inflater, container, false);
-        final ConstraintLayout root = binding.getRoot();
-        final ViewTreeObserver.OnPreDrawListener preDrawListener = new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                root.getViewTreeObserver().removeOnPreDrawListener(this);
-                return false;
-            }
-        };
-        root.getViewTreeObserver().addOnPreDrawListener(preDrawListener);
-        return root;
+        bottom = LayoutPostViewBottomBinding.bind(binding.getRoot());
+        return binding.getRoot();
     }
 
     @Override
     public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        // postponeEnterTransition();
         init();
     }
 
-    @Override
-    public void onAttach(@NonNull final Context context) {
-        super.onAttach(context);
-        this.context = context;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        final Dialog dialog = getDialog();
-        if (dialog == null) return;
-        final Window window = dialog.getWindow();
-        if (window == null) return;
-        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
-        window.setDimAmount(0);
-        int width = ViewGroup.LayoutParams.MATCH_PARENT;
-        int height = ViewGroup.LayoutParams.MATCH_PARENT;
-        window.setLayout(width, height);
-        if (!wasPaused && (sharedProfilePicElement != null || sharedMainPostElement != null)) {
-            final ObjectAnimator animator = ObjectAnimator.ofPropertyValuesHolder(
-                    binding.getRoot().getBackground().mutate(),
-                    PropertyValuesHolder.ofInt("alpha", 0, 255)
-            );
-            addAnimator(animator);
-        }
-        if (onShowListener != null) {
-            onShowListener.onShow(dialog);
-        }
-    }
-
     @Override
     public void onPause() {
         super.onPause();
-        wasPaused = true;
-        if (bottomSheetBehavior != null) {
-            captionState = bottomSheetBehavior.getState();
-        }
+        // wasPaused = true;
+        if (settingsHelper.getBoolean(Constants.PLAY_IN_BACKGROUND)) return;
         final Media media = viewModel.getMedia();
         if (media == null) return;
         switch (media.getMediaType()) {
@@ -364,6 +212,7 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        showSystemUI();
         final Media media = viewModel.getMedia();
         if (media == null) return;
         switch (media.getMediaType()) {
@@ -390,85 +239,12 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         }
     }
 
-    @Override
-    protected void onBeforeSharedElementAnimation(@NonNull final View startView,
-                                                  @NonNull final View destView,
-                                                  @NonNull final SharedElementTransitionDialogFragment.ViewBounds viewBounds) {
-        GenericDraweeHierarchy hierarchy = null;
-        if (destView == binding.postImage) {
-            hierarchy = binding.postImage.getHierarchy();
-        } else if (destView == binding.videoPost.thumbnailParent) {
-            hierarchy = binding.videoPost.thumbnail.getHierarchy();
-        }
-        if (hierarchy != null) {
-            final ScalingUtils.ScaleType scaleTypeTo = ScalingUtils.ScaleType.FIT_CENTER;
-            final ScalingUtils.InterpolatingScaleType scaleType = new ScalingUtils.InterpolatingScaleType(
-                    ScalingUtils.ScaleType.CENTER_CROP,
-                    scaleTypeTo,
-                    viewBounds.getStartBounds(),
-                    viewBounds.getDestBounds()
-            );
-            hierarchy.setActualImageScaleType(scaleType);
-            final ValueAnimator animator = ValueAnimator.ofFloat(0, 1);
-            animator.setDuration(getAnimationDuration());
-            animator.addUpdateListener(animation -> {
-                float fraction = (float) animation.getAnimatedValue();
-                scaleType.setValue(fraction);
-            });
-            final GenericDraweeHierarchy finalHierarchy = hierarchy;
-            animator.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    finalHierarchy.setActualImageScaleType(scaleTypeTo);
-                    destView.requestLayout();
-                }
-            });
-            addAnimator(animator);
-        }
-    }
-
-    @Override
-    protected void onEndSharedElementAnimation(@NonNull final View startView,
-                                               @NonNull final View destView,
-                                               @NonNull final ViewBounds viewBounds) {
-        if (destView == binding.postImage) {
-            binding.postImage.setTranslationX(0);
-            binding.postImage.setTranslationY(0);
-            binding.postImage.setX(0);
-            binding.postImage.setY(0);
-            binding.postImage.setLayoutParams(new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                                ViewGroup.LayoutParams.MATCH_PARENT));
-            binding.postImage.requestLayout();
-            if (bottomSheetBehavior != null) {
-                bottomSheetBehavior.setState(captionState);
-            }
-            return;
-        }
-        if (destView == binding.sliderParent) {
-            binding.sliderParent.setLayoutParams(new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                                   ViewGroup.LayoutParams.MATCH_PARENT));
-            binding.sliderParent.requestLayout();
-            if (bottomSheetBehavior != null) {
-                bottomSheetBehavior.setState(captionState);
-            }
-            return;
-        }
-        if (destView == binding.videoPost.thumbnailParent) {
-            final FrameLayout.LayoutParams params = new ViewSwitcher.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                                  ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.gravity = Gravity.CENTER;
-            binding.videoPost.thumbnailParent.setLayoutParams(params);
-            binding.videoPost.thumbnailParent.requestLayout();
-            if (bottomSheetBehavior != null) {
-                bottomSheetBehavior.setState(captionState);
-            }
-        }
-    }
-
     @Override
     public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode == STORAGE_PERM_REQUEST_CODE && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            final Context context = getContext();
+            if (context == null) return;
             DownloadUtils.showDownloadDialog(context, viewModel.getMedia(), sliderPosition);
         }
     }
@@ -476,17 +252,17 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     private void init() {
         final Bundle arguments = getArguments();
         if (arguments == null) {
-            dismiss();
+            // dismiss();
             return;
         }
         final Serializable feedModelSerializable = arguments.getSerializable(ARG_MEDIA);
         if (feedModelSerializable == null) {
             Log.e(TAG, "onCreate: feedModelSerializable is null");
-            dismiss();
+            // dismiss();
             return;
         }
         if (!(feedModelSerializable instanceof Media)) {
-            dismiss();
+            // dismiss();
             return;
         }
         final Media media = (Media) feedModelSerializable;
@@ -494,11 +270,11 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             sliderPosition = arguments.getInt(ARG_SLIDER_POSITION, 0);
         }
         viewModel.setMedia(media);
-        if (!wasPaused && (sharedProfilePicElement != null || sharedMainPostElement != null)) {
-            binding.getRoot().getBackground().mutate().setAlpha(0);
-        }
-        setProfilePicSharedElement();
-        setupCaptionBottomSheet();
+        // if (!wasPaused && (sharedProfilePicElement != null || sharedMainPostElement != null)) {
+        //     binding.getRoot().getBackground().mutate().setAlpha(0);
+        // }
+        // setProfilePicSharedElement();
+        // setupCaptionBottomSheet();
         setupCommonActions();
         setObservers();
     }
@@ -506,10 +282,14 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     private void setObservers() {
         viewModel.getUser().observe(getViewLifecycleOwner(), user -> {
             if (user == null) {
-                binding.userDetailsGroup.setVisibility(View.GONE);
+                binding.profilePic.setVisibility(View.GONE);
+                binding.title.setVisibility(View.GONE);
+                binding.subtitle.setVisibility(View.GONE);
                 return;
             }
-            binding.userDetailsGroup.setVisibility(View.VISIBLE);
+            binding.profilePic.setVisibility(View.VISIBLE);
+            binding.title.setVisibility(View.VISIBLE);
+            binding.subtitle.setVisibility(View.VISIBLE);
             binding.getRoot().post(() -> setupProfilePic(user));
             binding.getRoot().post(() -> setupTitles(user));
         });
@@ -517,33 +297,34 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         viewModel.getLocation().observe(getViewLifecycleOwner(), location -> binding.getRoot().post(() -> setupLocation(location)));
         viewModel.getDate().observe(getViewLifecycleOwner(), date -> binding.getRoot().post(() -> {
             if (date == null) {
-                binding.date.setVisibility(View.GONE);
+                bottom.date.setVisibility(View.GONE);
                 return;
             }
-            binding.date.setVisibility(View.VISIBLE);
-            binding.date.setText(date);
+            bottom.date.setVisibility(View.VISIBLE);
+            bottom.date.setText(date);
         }));
         viewModel.getLikeCount().observe(getViewLifecycleOwner(), count -> {
-            final long safeCount = getSafeCount(count);
-            final String likesString = getResources().getQuantityString(R.plurals.likes_count, (int) safeCount, safeCount);
-            binding.likesCount.setText(likesString);
+            bottom.likesCount.setNumber(getSafeCount(count));
+            binding.getRoot().postDelayed(() -> bottom.likesCount.setAnimateChanges(true), 1000);
+            if (count > 1000 && !settingsHelper.getBoolean(PREF_SHOWN_COUNT_TOOLTIP)) {
+                binding.getRoot().postDelayed(this::showCountTooltip, 1000);
+            }
         });
         if (!viewModel.getMedia().isCommentsDisabled()) {
             viewModel.getCommentCount().observe(getViewLifecycleOwner(), count -> {
-                final long safeCount = getSafeCount(count);
-                final String likesString = getResources().getQuantityString(R.plurals.comments_count, (int) safeCount, safeCount);
-                binding.commentsCount.setText(likesString);
+                bottom.commentsCount.setNumber(getSafeCount(count));
+                binding.getRoot().postDelayed(() -> bottom.commentsCount.setAnimateChanges(true), 1000);
             });
         }
         viewModel.getViewCount().observe(getViewLifecycleOwner(), count -> {
             if (count == null) {
-                binding.viewsCount.setVisibility(View.GONE);
+                bottom.viewsCount.setVisibility(View.GONE);
                 return;
             }
-            binding.viewsCount.setVisibility(View.VISIBLE);
+            bottom.viewsCount.setVisibility(View.VISIBLE);
             final long safeCount = getSafeCount(count);
             final String viewString = getResources().getQuantityString(R.plurals.views_count, (int) safeCount, safeCount);
-            binding.viewsCount.setText(viewString);
+            bottom.viewsCount.setText(viewString);
         });
         viewModel.getType().observe(getViewLifecycleOwner(), this::setupPostTypeLayout);
         viewModel.getLiked().observe(getViewLifecycleOwner(), this::setLikedResources);
@@ -554,6 +335,45 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         }));
     }
 
+    private void showCountTooltip() {
+        final Context context = getContext();
+        if (context == null) return;
+        final Rect rect = new Rect();
+        bottom.likesCount.getGlobalVisibleRect(rect);
+        final Balloon balloon = new Balloon.Builder(context)
+                .setArrowSize(8)
+                .setArrowOrientation(ArrowOrientation.TOP)
+                .setArrowPositionRules(ArrowPositionRules.ALIGN_ANCHOR)
+                .setArrowPosition(0.5f)
+                .setWidth(BalloonSizeSpec.WRAP)
+                .setHeight(BalloonSizeSpec.WRAP)
+                .setPadding(4)
+                .setTextSize(16)
+                .setAlpha(0.9f)
+                .setBalloonAnimation(BalloonAnimation.ELASTIC)
+                .setBalloonHighlightAnimation(BalloonHighlightAnimation.HEARTBEAT, 0)
+                .setIsVisibleOverlay(true)
+                .setOverlayColorResource(R.color.black_a50)
+                .setOverlayShape(new BalloonOverlayCircle((float) Math.max(
+                        bottom.likesCount.getMeasuredWidth(),
+                        bottom.likesCount.getMeasuredHeight()
+                ) / 2f))
+                .setBalloonOverlayAnimation(BalloonOverlayAnimation.FADE)
+                .setLifecycleOwner(getViewLifecycleOwner())
+                .setTextResource(R.string.click_to_show_full)
+                .setDismissWhenTouchOutside(false)
+                .setDismissWhenOverlayClicked(false)
+                .build();
+        balloon.showAlignBottom(bottom.likesCount);
+        settingsHelper.putBoolean(PREF_SHOWN_COUNT_TOOLTIP, true);
+        balloon.setOnBalloonOutsideTouchListener((view, motionEvent) -> {
+            if (rect.contains((int) motionEvent.getRawX(), (int) motionEvent.getRawY())) {
+                bottom.likesCount.setShowAbbreviation(false);
+            }
+            balloon.dismiss();
+        });
+    }
+
     @NonNull
     private Long getSafeCount(final Long count) {
         Long safeCount = count;
@@ -563,30 +383,6 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         return safeCount;
     }
 
-    private void setupCaptionBottomSheet() {
-        bottomSheetBehavior = BottomSheetBehavior.from(binding.captionParent);
-        bottomSheetBehavior.setState(captionState);
-        bottomSheetBehavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-            @Override
-            public void onStateChanged(@NonNull final View bottomSheet, final int newState) {}
-
-            @Override
-            public void onSlide(@NonNull final View bottomSheet, final float slideOffset) {
-                binding.captionParent.getBackground().mutate().setAlpha((int) (128 + (128 * (slideOffset < 0 ? 0 : slideOffset))));
-            }
-        });
-        if (sharedProfilePicElement == null || sharedMainPostElement == null) {
-            binding.getRoot().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    binding.getRoot().getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                    if (bottomSheetBehavior == null) return;
-                    bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-                }
-            });
-        }
-    }
-
     private void setupCommonActions() {
         setupLike();
         setupSave();
@@ -597,12 +393,12 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
 
     private void setupComment() {
         if (!viewModel.hasPk() || viewModel.getMedia().isCommentsDisabled()) {
-            binding.comment.setVisibility(View.GONE);
-            binding.commentsCount.setVisibility(View.GONE);
+            bottom.comment.setVisibility(View.GONE);
+            // bottom.commentsCount.setVisibility(View.GONE);
             return;
         }
-        binding.comment.setVisibility(View.VISIBLE);
-        binding.comment.setOnClickListener(v -> {
+        bottom.comment.setVisibility(View.VISIBLE);
+        bottom.comment.setOnClickListener(v -> {
             final Media media = viewModel.getMedia();
             final User user = media.getUser();
             if (user == null) return;
@@ -612,23 +408,33 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             bundle.putString("shortCode", media.getCode());
             bundle.putString("postId", media.getPk());
             bundle.putLong("postUserId", user.getPk());
-            navController.navigate(R.id.action_global_commentsViewerFragment, bundle);
+            try {
+                navController.navigate(R.id.action_global_commentsViewerFragment, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "setupComment: ", e);
+            }
         });
-        binding.comment.setOnLongClickListener(v -> {
+        bottom.comment.setOnLongClickListener(v -> {
+            final Context context = getContext();
+            if (context == null) return false;
             Utils.displayToastAboveView(context, v, getString(R.string.comment));
             return true;
         });
     }
 
     private void setupDownload() {
-        binding.download.setOnClickListener(v -> {
+        bottom.download.setOnClickListener(v -> {
+            final Context context = getContext();
+            if (context == null) return;
             if (checkSelfPermission(context, WRITE_PERMISSION) == PermissionChecker.PERMISSION_GRANTED) {
                 DownloadUtils.showDownloadDialog(context, viewModel.getMedia(), sliderPosition);
                 return;
             }
             requestPermissions(DownloadUtils.PERMS, STORAGE_PERM_REQUEST_CODE);
         });
-        binding.download.setOnLongClickListener(v -> {
+        bottom.download.setOnLongClickListener(v -> {
+            final Context context = getContext();
+            if (context == null) return false;
             Utils.displayToastAboveView(context, v, getString(R.string.action_download));
             return true;
         });
@@ -637,19 +443,19 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     private void setupLike() {
         final boolean likableMedia = viewModel.hasPk() /*&& viewModel.getMedia().isCommentLikesEnabled()*/;
         if (!likableMedia) {
-            binding.like.setVisibility(View.GONE);
-            binding.likesCount.setVisibility(View.GONE);
+            bottom.like.setVisibility(View.GONE);
+            // bottom.likesCount.setVisibility(View.GONE);
             return;
         }
         if (!viewModel.isLoggedIn()) {
-            binding.like.setVisibility(View.GONE);
+            bottom.like.setVisibility(View.GONE);
             return;
         }
-        binding.like.setOnClickListener(v -> {
+        bottom.like.setOnClickListener(v -> {
             v.setEnabled(false);
             handleLikeUnlikeResourceLiveData(viewModel.toggleLike());
         });
-        binding.like.setOnLongClickListener(v -> {
+        bottom.like.setOnLongClickListener(v -> {
             final NavController navController = getNavController();
             if (navController != null && viewModel.isLoggedIn()) {
                 final Bundle bundle = new Bundle();
@@ -666,14 +472,14 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         resource.observe(getViewLifecycleOwner(), value -> {
             switch (value.status) {
                 case SUCCESS:
-                    binding.like.setEnabled(true);
+                    bottom.like.setEnabled(true);
                     break;
                 case ERROR:
-                    binding.like.setEnabled(true);
+                    bottom.like.setEnabled(true);
                     unsuccessfulLike();
                     break;
                 case LOADING:
-                    binding.like.setEnabled(false);
+                    bottom.like.setEnabled(false);
                     break;
             }
         });
@@ -698,29 +504,33 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     private void setLikedResources(final boolean liked) {
         final int iconResource;
         final int tintResource;
+        final Context context = getContext();
+        if (context == null) return;
+        final Resources resources = context.getResources();
+        if (resources == null) return;
         if (liked) {
             iconResource = R.drawable.ic_like;
-            tintResource = R.color.red_600;
+            tintResource = resources.getColor(R.color.red_600);
             // textResId = R.string.unlike_without_count;
         } else {
             iconResource = R.drawable.ic_not_liked;
-            tintResource = R.color.white;
+            tintResource = getAttrValue(context, R.attr.colorPrimary);
             // textResId = R.string.like_without_count;
         }
-        binding.like.setIconResource(iconResource);
-        binding.like.setIconTintResource(tintResource);
+        bottom.like.setIconResource(iconResource);
+        bottom.like.setIconTint(ColorStateList.valueOf(tintResource));
     }
 
     private void setupSave() {
         if (!viewModel.isLoggedIn() || !viewModel.hasPk() || !viewModel.getMedia().canViewerSave()) {
-            binding.save.setVisibility(View.GONE);
+            bottom.save.setVisibility(View.GONE);
             return;
         }
-        binding.save.setOnClickListener(v -> {
-            binding.save.setEnabled(false);
+        bottom.save.setOnClickListener(v -> {
+            bottom.save.setEnabled(false);
             handleSaveUnsaveResourceLiveData(viewModel.toggleSave());
         });
-        binding.save.setOnLongClickListener(v -> {
+        bottom.save.setOnLongClickListener(v -> {
             final NavController navController = NavHostFragment.findNavController(this);
             final Bundle bundle = new Bundle();
             bundle.putBoolean("isSaving", true);
@@ -734,14 +544,14 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             if (value == null) return;
             switch (value.status) {
                 case SUCCESS:
-                    binding.save.setEnabled(true);
+                    bottom.save.setEnabled(true);
                     break;
                 case ERROR:
-                    binding.save.setEnabled(true);
+                    bottom.save.setEnabled(true);
                     unsuccessfulSave();
                     break;
                 case LOADING:
-                    binding.save.setEnabled(false);
+                    bottom.save.setEnabled(false);
                     break;
             }
         });
@@ -765,23 +575,21 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     private void setSavedResources(final boolean saved) {
         final int iconResource;
         final int tintResource;
+        final Context context = getContext();
+        if (context == null) return;
+        final Resources resources = context.getResources();
+        if (resources == null) return;
         if (saved) {
-            iconResource = R.drawable.ic_class_24;
-            tintResource = R.color.blue_700;
+            iconResource = R.drawable.ic_bookmark;
+            tintResource = resources.getColor(R.color.blue_700);
             // textResId = R.string.saved;
         } else {
-            iconResource = R.drawable.ic_outline_class_24;
-            tintResource = R.color.white;
+            iconResource = R.drawable.ic_round_bookmark_border_24;
+            tintResource = getAttrValue(context, R.attr.colorPrimary);
             // textResId = R.string.save;
         }
-        binding.save.setIconResource(iconResource);
-        binding.save.setIconTintResource(tintResource);
-    }
-
-    private void setProfilePicSharedElement() {
-        if (!wasPaused && sharedProfilePicElement != null) {
-            addSharedElement(sharedProfilePicElement, binding.profilePic);
-        }
+        bottom.save.setIconResource(iconResource);
+        bottom.save.setIconTint(ColorStateList.valueOf(tintResource));
     }
 
     private void setupProfilePic(final User user) {
@@ -793,19 +601,6 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         final DraweeController controller = Fresco
                 .newDraweeControllerBuilder()
                 .setUri(uri)
-                .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                    @Override
-                    public void onFailure(final String id, final Throwable throwable) {
-                        startPostponedEnterTransition();
-                    }
-
-                    @Override
-                    public void onFinalImageSet(final String id,
-                                                final ImageInfo imageInfo,
-                                                final Animatable animatable) {
-                        startPostponedEnterTransition();
-                    }
-                })
                 .build();
         binding.profilePic.setController(controller);
         binding.profilePic.setOnClickListener(v -> navigateToProfile("@" + user.getUsername()));
@@ -817,7 +612,13 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             binding.subtitle.setVisibility(View.GONE);
             return;
         }
-        binding.subtitle.setText(user.getFullName());
+        final String fullName = user.getFullName();
+        if (TextUtils.isEmpty(fullName)) {
+            binding.subtitle.setVisibility(View.GONE);
+        } else {
+            binding.subtitle.setVisibility(View.VISIBLE);
+            binding.subtitle.setText(fullName);
+        }
         setUsername(user);
         binding.title.setOnClickListener(v -> navigateToProfile("@" + user.getUsername()));
         binding.subtitle.setOnClickListener(v -> navigateToProfile("@" + user.getUsername()));
@@ -827,6 +628,8 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         final SpannableStringBuilder sb = new SpannableStringBuilder(user.getUsername());
         final int drawableSize = Utils.convertDpToPx(24);
         if (user.isVerified()) {
+            final Context context = getContext();
+            if (context == null) return;
             final Drawable verifiedDrawable = AppCompatResources.getDrawable(context, R.drawable.verified);
             VerticalImageSpan verifiedSpan = null;
             if (verifiedDrawable != null) {
@@ -848,55 +651,32 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
 
     private void setupCaption(final Caption caption) {
         if (caption == null || TextUtils.isEmpty(caption.getText())) {
-            binding.caption.setVisibility(View.GONE);
-            binding.translate.setVisibility(View.GONE);
-            binding.captionToggle.setVisibility(View.GONE);
+            bottom.caption.setVisibility(View.GONE);
+            bottom.translate.setVisibility(View.GONE);
             return;
         }
         final String postCaption = caption.getText();
-        binding.caption.addOnHashtagListener(autoLinkItem -> {
+        bottom.caption.addOnHashtagListener(autoLinkItem -> {
             final NavController navController = NavHostFragment.findNavController(this);
             final Bundle bundle = new Bundle();
             final String originalText = autoLinkItem.getOriginalText().trim();
             bundle.putString(ARG_HASHTAG, originalText);
             navController.navigate(R.id.action_global_hashTagFragment, bundle);
         });
-        binding.caption.addOnMentionClickListener(autoLinkItem -> {
+        bottom.caption.addOnMentionClickListener(autoLinkItem -> {
             final String originalText = autoLinkItem.getOriginalText().trim();
             navigateToProfile(originalText);
         });
-        binding.caption.addOnEmailClickListener(autoLinkItem -> Utils.openEmailAddress(getContext(), autoLinkItem.getOriginalText().trim()));
-        binding.caption.addOnURLClickListener(autoLinkItem -> Utils.openURL(getContext(), autoLinkItem.getOriginalText().trim()));
-        binding.caption.setOnLongClickListener(v -> {
+        bottom.caption.addOnEmailClickListener(autoLinkItem -> Utils.openEmailAddress(getContext(), autoLinkItem.getOriginalText().trim()));
+        bottom.caption.addOnURLClickListener(autoLinkItem -> Utils.openURL(getContext(), autoLinkItem.getOriginalText().trim()));
+        bottom.caption.setOnLongClickListener(v -> {
+            final Context context = getContext();
+            if (context == null) return false;
             Utils.copyText(context, postCaption);
             return true;
         });
-        binding.caption.setText(postCaption);
-        binding.translate.setOnClickListener(v -> handleTranslateCaptionResource(viewModel.translateCaption()));
-        binding.captionToggle.setOnClickListener(v -> {
-            if (bottomSheetBehavior == null) return;
-            switch (bottomSheetBehavior.getState()) {
-                case BottomSheetBehavior.STATE_HIDDEN:
-                    binding.captionParent.fullScroll(ScrollView.FOCUS_UP); // reset scroll position
-                    if (binding.playerControls.getRoot().getVisibility() == View.VISIBLE) {
-                        hidePlayerControls();
-                    }
-                    bottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-                    return;
-                case BottomSheetBehavior.STATE_COLLAPSED:
-                case BottomSheetBehavior.STATE_EXPANDED:
-                    bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
-                    return;
-                case BottomSheetBehavior.STATE_DRAGGING:
-                case BottomSheetBehavior.STATE_HALF_EXPANDED:
-                case BottomSheetBehavior.STATE_SETTLING:
-                default:
-            }
-        });
-        binding.captionToggle.setOnLongClickListener(v -> {
-            Utils.displayToastAboveView(context, v, getString(R.string.caption));
-            return true;
-        });
+        bottom.caption.setText(postCaption);
+        bottom.translate.setOnClickListener(v -> handleTranslateCaptionResource(viewModel.translateCaption()));
     }
 
     private void handleTranslateCaptionResource(@NonNull final LiveData<Resource<String>> data) {
@@ -904,11 +684,11 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             if (resource == null) return;
             switch (resource.status) {
                 case SUCCESS:
-                    binding.translate.setVisibility(View.GONE);
-                    binding.caption.setText(resource.data);
+                    bottom.translate.setVisibility(View.GONE);
+                    bottom.caption.setText(resource.data);
                     break;
                 case ERROR:
-                    binding.translate.setEnabled(true);
+                    bottom.translate.setEnabled(true);
                     String message = resource.message;
                     if (TextUtils.isEmpty(resource.message)) {
                         message = getString(R.string.downloader_unknown_error);
@@ -918,7 +698,7 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                     snackbar.show();
                     break;
                 case LOADING:
-                    binding.translate.setEnabled(false);
+                    bottom.translate.setEnabled(false);
                     break;
             }
         });
@@ -944,24 +724,28 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
 
     private void setupShare() {
         if (!viewModel.hasPk()) {
-            binding.share.setVisibility(View.GONE);
+            bottom.share.setVisibility(View.GONE);
             return;
         }
-        binding.share.setVisibility(View.VISIBLE);
-        binding.share.setOnLongClickListener(v -> {
+        bottom.share.setVisibility(View.VISIBLE);
+        bottom.share.setOnLongClickListener(v -> {
+            final Context context = getContext();
+            if (context == null) return false;
             Utils.displayToastAboveView(context, v, getString(R.string.share));
             return true;
         });
-        binding.share.setOnClickListener(v -> {
+        bottom.share.setOnClickListener(v -> {
             final Media media = viewModel.getMedia();
             final User profileModel = media.getUser();
             if (profileModel == null) return;
             final boolean isPrivate = profileModel.isPrivate();
             if (isPrivate) {
+                final Context context = getContext();
+                if (context == null) return;
                 // is this necessary?
                 Toast.makeText(context, R.string.share_private_post, Toast.LENGTH_LONG).show();
             }
-            Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+            final Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
             sharingIntent.setType("text/plain");
             sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, "https://instagram.com/p/" + media.getCode());
             startActivity(Intent.createChooser(sharingIntent,
@@ -984,72 +768,102 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     private void setupPostImage() {
-        binding.videoPost.root.setVisibility(View.GONE);
-        binding.sliderParent.setVisibility(View.GONE);
-        binding.playerControlsToggle.setVisibility(View.GONE);
-        binding.playerControls.getRoot().setVisibility(View.GONE);
-        binding.mediaCounter.setVisibility(View.GONE);
-        binding.postImage.setVisibility(View.VISIBLE);
-        if (!wasPaused && sharedMainPostElement != null) {
-            binding.postImage.getHierarchy().setActualImageScaleType(ScalingUtils.ScaleType.CENTER_CROP);
-            addSharedElement(sharedMainPostElement, binding.postImage);
-        }
+        // binding.mediaCounter.setVisibility(View.GONE);
+        final Context context = getContext();
+        if (context == null) return;
+        final Resources resources = context.getResources();
+        if (resources == null) return;
         final Media media = viewModel.getMedia();
-        final ImageRequest requestBuilder = ImageRequestBuilder.newBuilderWithSource(Uri.parse(ResponseBodyUtils.getImageUrl(media)))
-                                                               .setLocalThumbnailPreviewsEnabled(true)
-                                                               .build();
-        final DraweeController controller = Fresco
-                .newDraweeControllerBuilder()
-                .setLowResImageRequest(ImageRequest.fromUri(ResponseBodyUtils.getThumbUrl(media)))
-                .setImageRequest(requestBuilder)
-                .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                    @Override
-                    public void onFailure(final String id, final Throwable throwable) {
-                        startPostponedEnterTransition();
-                    }
+        final String imageUrl = ResponseBodyUtils.getImageUrl(media);
+        if (TextUtils.isEmpty(imageUrl)) return;
+        final ZoomableDraweeView postImage = new ZoomableDraweeView(context);
+        postView = postImage;
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(media.getOriginalHeight(),
+                                                                                            media.getOriginalWidth(),
+                                                                                            (int) (Utils.displayMetrics.heightPixels * 0.8),
+                                                                                            Utils.displayMetrics.widthPixels);
+        originalHeight = widthHeight.second;
+        final ConstraintLayout.LayoutParams layoutParams = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.MATCH_PARENT,
+                                                                                             originalHeight);
+        layoutParams.topToBottom = binding.topBarrier.getId();
+        layoutParams.bottomToTop = bottom.buttonsTopBarrier.getId();
+        layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+        layoutParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+        postImage.setLayoutParams(layoutParams);
+        postImage.setHierarchy(new GenericDraweeHierarchyBuilder(resources)
+                                       .setActualImageScaleType(ScalingUtils.ScaleType.FIT_CENTER)
+                                       .build());
 
-                    @Override
-                    public void onFinalImageSet(final String id,
-                                                final ImageInfo imageInfo,
-                                                final Animatable animatable) {
-                        startPostponedEnterTransition();
-                    }
-                })
-                .build();
-        binding.postImage.setController(controller);
-        // binding.postImage.setOnClickListener(v -> toggleDetails());
-        final AnimatedZoomableController zoomableController = AnimatedZoomableController.newInstance();
+        postImage.setController(Fresco.newDraweeControllerBuilder()
+                                      .setLowResImageRequest(ImageRequest.fromUri(ResponseBodyUtils.getThumbUrl(media)))
+                                      .setImageRequest(ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageUrl))
+                                                                          .setLocalThumbnailPreviewsEnabled(true)
+                                                                          .build())
+                                      .build());
+        final AnimatedZoomableController zoomableController = (AnimatedZoomableController) postImage.getZoomableController();
         zoomableController.setMaxScaleFactor(3f);
-        binding.postImage.setZoomableController(zoomableController);
-        binding.postImage.setTapListener(new GestureDetector.SimpleOnGestureListener() {
+        zoomableController.setGestureZoomEnabled(true);
+        zoomableController.setEnabled(true);
+        postImage.setZoomingEnabled(true);
+        final DoubleTapGestureListener tapListener = new DoubleTapGestureListener(postImage) {
             @Override
-            public boolean onSingleTapUp(final MotionEvent e) {
-                toggleDetails();
-                return true;
+            public boolean onSingleTapConfirmed(final MotionEvent e) {
+                if (!isInFullScreenMode) {
+                    zoomableController.reset();
+                    hideSystemUI();
+                } else {
+                    showSystemUI();
+                    binding.getRoot().postDelayed(zoomableController::reset, 500);
+                }
+                return super.onSingleTapConfirmed(e);
             }
-        });
-        binding.postImage.setAllowTouchInterceptionWhileZoomed(true);
-        // binding.postImage.setOnVerticalDragListener(onVerticalDragListener);
+        };
+        postImage.setTapListener(tapListener);
+        // postImage.setAllowTouchInterceptionWhileZoomed(true);
+        binding.contentRoot.addView(postImage, 0);
     }
 
     private void setupSlider() {
         final Media media = viewModel.getMedia();
-        binding.postImage.setVisibility(View.GONE);
-        binding.videoPost.root.setVisibility(View.GONE);
-        binding.playerControlsToggle.setVisibility(View.GONE);
-        binding.playerControls.getRoot().setVisibility(View.GONE);
-        binding.sliderParent.setVisibility(View.VISIBLE);
         binding.mediaCounter.setVisibility(View.VISIBLE);
-        if (!wasPaused && sharedMainPostElement != null) {
-            addSharedElement(sharedMainPostElement, binding.sliderParent);
-        }
+        final Context context = getContext();
+        if (context == null) return;
+        sliderParent = new ViewPager2(context);
+        final NullSafePair<Integer, Integer> maxHW = media
+                .getCarouselMedia()
+                .stream()
+                .reduce(new NullSafePair<>(0, 0),
+                        (prev, m) -> {
+                            final int height = m.getOriginalHeight() > prev.first ? m.getOriginalHeight() : prev.first;
+                            final int width = m.getOriginalWidth() > prev.second ? m.getOriginalWidth() : prev.second;
+                            return new NullSafePair<>(height, width);
+                        },
+                        (p1, p2) -> {
+                            final int height = p1.first > p2.first ? p1.first : p2.first;
+                            final int width = p1.second > p2.second ? p1.second : p2.second;
+                            return new NullSafePair<>(height, width);
+                        });
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(maxHW.first,
+                                                                                            maxHW.second,
+                                                                                            (int) (Utils.displayMetrics.heightPixels * 0.8),
+                                                                                            Utils.displayMetrics.widthPixels);
+        originalHeight = widthHeight.second;
+        final ConstraintLayout.LayoutParams layoutParams = new ConstraintLayout.LayoutParams(ConstraintLayout.LayoutParams.MATCH_PARENT,
+                                                                                             originalHeight);
+        layoutParams.topToBottom = binding.topBarrier.getId();
+        layoutParams.bottomToTop = bottom.buttonsTopBarrier.getId();
+        layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+        layoutParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+        sliderParent.setLayoutParams(layoutParams);
+        postView = sliderParent;
+        binding.contentRoot.addView(sliderParent, 0);
+
         final boolean hasVideo = media.getCarouselMedia()
                                       .stream()
                                       .anyMatch(postChild -> postChild.getMediaType() == MediaItemType.MEDIA_TYPE_VIDEO);
         if (hasVideo) {
-            final View child = binding.sliderParent.getChildAt(0);
+            final View child = sliderParent.getChildAt(0);
             if (child instanceof RecyclerView) {
                 ((RecyclerView) child).setItemViewCacheSize(media.getCarouselMedia().size());
                 ((RecyclerView) child).addRecyclerListener(holder -> {
@@ -1059,16 +873,23 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 });
             }
         }
-        sliderItemsAdapter = new SliderItemsAdapter(null, binding.playerControls, true, new SliderCallbackAdapter() {
+        sliderItemsAdapter = new SliderItemsAdapter(true, new SliderCallbackAdapter() {
             @Override
-            public void onThumbnailLoaded(final int position) {
-                if (position != 0) return;
-                startPostponedEnterTransition();
-            }
-
-            @Override
-            public void onItemClicked(final int position) {
-                toggleDetails();
+            public void onItemClicked(final int position, final Media media, final View view) {
+                if (media == null
+                        || media.getMediaType() != MediaItemType.MEDIA_TYPE_IMAGE
+                        || !(view instanceof ZoomableDraweeView)) {
+                    return;
+                }
+                final ZoomableController zoomableController = ((ZoomableDraweeView) view).getZoomableController();
+                if (!(zoomableController instanceof AnimatedZoomableController)) return;
+                if (!isInFullScreenMode) {
+                    ((AnimatedZoomableController) zoomableController).reset();
+                    hideSystemUI();
+                    return;
+                }
+                showSystemUI();
+                binding.getRoot().postDelayed(((AnimatedZoomableController) zoomableController)::reset, 500);
             }
 
             @Override
@@ -1076,8 +897,8 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 final FragmentActivity activity = getActivity();
                 if (activity == null) return;
                 Utils.enabledKeepScreenOn(activity);
-                if (!detailsVisible || hasBeenToggled) return;
-                showPlayerControls();
+                // if (!detailsVisible || hasBeenToggled) return;
+                // showPlayerControls();
             }
 
             @Override
@@ -1085,8 +906,8 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 final FragmentActivity activity = getActivity();
                 if (activity == null) return;
                 Utils.disableKeepScreenOn(activity);
-                if (detailsVisible || hasBeenToggled) return;
-                toggleDetails();
+                // if (detailsVisible || hasBeenToggled) return;
+                // toggleDetails();
             }
 
             @Override
@@ -1095,18 +916,33 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 if (activity == null) return;
                 Utils.disableKeepScreenOn(activity);
             }
+
+            @Override
+            public void onFullScreenModeChanged(final boolean isFullScreen, final StyledPlayerView playerView) {
+                PostViewV2Fragment.this.playerView = playerView;
+                if (isFullScreen) {
+                    hideSystemUI();
+                    return;
+                }
+                showSystemUI();
+            }
+
+            @Override
+            public boolean isInFullScreen() {
+                return isInFullScreenMode;
+            }
         });
-        binding.sliderParent.setAdapter(sliderItemsAdapter);
+        sliderParent.setAdapter(sliderItemsAdapter);
         if (sliderPosition >= 0 && sliderPosition < media.getCarouselMedia().size()) {
-            binding.sliderParent.setCurrentItem(sliderPosition);
+            sliderParent.setCurrentItem(sliderPosition);
         }
-        binding.sliderParent.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+        sliderParent.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             int prevPosition = -1;
 
             @Override
             public void onPageScrolled(final int position, final float positionOffset, final int positionOffsetPixels) {
                 if (prevPosition != -1) {
-                    final View view = binding.sliderParent.getChildAt(0);
+                    final View view = sliderParent.getChildAt(0);
                     if (view instanceof RecyclerView) {
                         pausePlayerAtPosition(prevPosition, (RecyclerView) view);
                         pausePlayerAtPosition(position, (RecyclerView) view);
@@ -1125,28 +961,30 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 final String text = (position + 1) + "/" + size;
                 binding.mediaCounter.setText(text);
                 final Media childMedia = media.getCarouselMedia().get(position);
-                final View view = binding.sliderParent.getChildAt(0);
-                if (prevPosition != -1) {
-                    if (view instanceof RecyclerView) {
-                        final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(prevPosition);
-                        if (viewHolder instanceof SliderVideoViewHolder) {
-                            ((SliderVideoViewHolder) viewHolder).removeCallbacks();
-                        }
-                    }
-                }
+                // final View view = binding.sliderParent.getChildAt(0);
+                // if (prevPosition != -1) {
+                // if (view instanceof RecyclerView) {
+                // final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(prevPosition);
+                // if (viewHolder instanceof SliderVideoViewHolder) {
+                //     ((SliderVideoViewHolder) viewHolder).removeCallbacks();
+                // }
+                // }
+                // }
+                video = false;
                 if (childMedia.getMediaType() == MediaItemType.MEDIA_TYPE_VIDEO) {
-                    if (view instanceof RecyclerView) {
-                        final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(position);
-                        if (viewHolder instanceof SliderVideoViewHolder) {
-                            ((SliderVideoViewHolder) viewHolder).resetPlayerTimeline();
-                        }
-                    }
-                    enablePlayerControls(true);
+                    // if (view instanceof RecyclerView) {
+                    // final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(position);
+                    // if (viewHolder instanceof SliderVideoViewHolder) {
+                    //     ((SliderVideoViewHolder) viewHolder).resetPlayerTimeline();
+                    // }
+                    // }
+                    // enablePlayerControls(true);
+                    video = true;
                     viewModel.setViewCount(childMedia.getViewCount());
                     return;
                 }
                 viewModel.setViewCount(null);
-                enablePlayerControls(false);
+                // enablePlayerControls(false);
             }
 
             private void pausePlayerAtPosition(final int position, final RecyclerView view) {
@@ -1162,9 +1000,9 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     }
 
     private void pauseSliderPlayer() {
-        if (binding.sliderParent.getVisibility() != View.VISIBLE) return;
-        final int currentItem = binding.sliderParent.getCurrentItem();
-        final View view = binding.sliderParent.getChildAt(0);
+        if (sliderParent == null) return;
+        final int currentItem = sliderParent.getCurrentItem();
+        final View view = sliderParent.getChildAt(0);
         if (!(view instanceof RecyclerView)) return;
         final RecyclerView.ViewHolder viewHolder = ((RecyclerView) view).findViewHolderForAdapterPosition(currentItem);
         if (!(viewHolder instanceof SliderVideoViewHolder)) return;
@@ -1172,8 +1010,8 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     }
 
     private void releaseAllSliderPlayers() {
-        if (binding.sliderParent.getVisibility() != View.VISIBLE) return;
-        final View view = binding.sliderParent.getChildAt(0);
+        if (sliderParent == null) return;
+        final View view = sliderParent.getChildAt(0);
         if (!(view instanceof RecyclerView)) return;
         final int itemCount = sliderItemsAdapter.getItemCount();
         for (int position = itemCount - 1; position >= 0; position--) {
@@ -1183,44 +1021,40 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     private void setupVideo() {
+        video = true;
         final Media media = viewModel.getMedia();
-        binding.postImage.setVisibility(View.GONE);
-        binding.sliderParent.setVisibility(View.GONE);
         binding.mediaCounter.setVisibility(View.GONE);
-        // binding.playerControls.getRoot().setVisibility(View.VISIBLE);
-        if (!wasPaused && sharedMainPostElement != null) {
-            final GenericDraweeHierarchy hierarchy = binding.videoPost.thumbnail.getHierarchy();
-            hierarchy.setActualImageScaleType(ScalingUtils.ScaleType.CENTER_CROP);
-            addSharedElement(sharedMainPostElement, binding.videoPost.thumbnailParent);
-        }
-        binding.videoPost.root.setVisibility(View.VISIBLE);
-        // final VerticalDragHelper thumbnailVerticalDragHelper = new VerticalDragHelper(binding.videoPost.thumbnailParent);
-        // final VerticalDragHelper playerVerticalDragHelper = new VerticalDragHelper(binding.videoPost.playerView);
-        // thumbnailVerticalDragHelper.setOnVerticalDragListener(onVerticalDragListener);
-        // playerVerticalDragHelper.setOnVerticalDragListener(onVerticalDragListener);
-        enablePlayerControls(true);
-        // binding.videoPost.thumbnailParent.setOnTouchListener((v, event) -> {
-        //     final boolean onDragTouch = thumbnailVerticalDragHelper.onDragTouch(event);
-        //     if (onDragTouch) {
+        final Context context = getContext();
+        if (context == null) return;
+        final LayoutVideoPlayerWithThumbnailBinding videoPost = LayoutVideoPlayerWithThumbnailBinding
+                .inflate(LayoutInflater.from(context), binding.contentRoot, false);
+        final ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) videoPost.getRoot().getLayoutParams();
+        final NullSafePair<Integer, Integer> widthHeight = NumberUtils.calculateWidthHeight(media.getOriginalHeight(),
+                                                                                            media.getOriginalWidth(),
+                                                                                            (int) (Utils.displayMetrics.heightPixels * 0.8),
+                                                                                            Utils.displayMetrics.widthPixels);
+        layoutParams.width = ConstraintLayout.LayoutParams.MATCH_PARENT;
+        originalHeight = widthHeight.second;
+        layoutParams.height = originalHeight;
+        layoutParams.topToBottom = binding.topBarrier.getId();
+        layoutParams.bottomToTop = bottom.buttonsTopBarrier.getId();
+        layoutParams.startToStart = ConstraintLayout.LayoutParams.PARENT_ID;
+        layoutParams.endToEnd = ConstraintLayout.LayoutParams.PARENT_ID;
+        postView = videoPost.getRoot();
+        binding.contentRoot.addView(postView, 0);
+
+        // final GestureDetector gestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() {
+        //     @Override
+        //     public boolean onSingleTapConfirmed(final MotionEvent e) {
+        //         videoPost.playerView.performClick();
         //         return true;
         //     }
-        //     return thumbnailVerticalDragHelper.onGestureTouchEvent(event);
         // });
-        // binding.videoPost.playerView.setOnTouchListener((v, event) -> {
-        //     final boolean onDragTouch = playerVerticalDragHelper.onDragTouch(event);
-        //     if (onDragTouch) {
-        //         return true;
-        //     }
-        //     return playerVerticalDragHelper.onGestureTouchEvent(event);
+        // videoPost.playerView.setOnTouchListener((v, event) -> {
+        //     gestureDetector.onTouchEvent(event);
+        //     return true;
         // });
-        binding.videoPost.playerView.setOnClickListener(v -> toggleDetails());
-        final GestureDetector gestureDetector = new GestureDetector(context, videoPlayerViewGestureListener);
-        binding.videoPost.playerView.setOnTouchListener((v, event) -> {
-            gestureDetector.onTouchEvent(event);
-            return true;
-        });
         final float vol = settingsHelper.getBoolean(Constants.MUTED_VIDEOS) ? 0f : 1f;
         final VideoPlayerViewHelper.VideoPlayerCallback videoPlayerCallback = new VideoPlayerCallbackAdapter() {
             @Override
@@ -1231,13 +1065,13 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
             @Override
             public void onPlayerViewLoaded() {
                 // binding.playerControls.getRoot().setVisibility(View.VISIBLE);
-                final ViewGroup.LayoutParams layoutParams = binding.videoPost.playerView.getLayoutParams();
+                final ViewGroup.LayoutParams layoutParams = videoPost.playerView.getLayoutParams();
                 final int requiredWidth = Utils.displayMetrics.widthPixels;
                 final int resultingHeight = NumberUtils
                         .getResultingHeight(requiredWidth, media.getOriginalHeight(), media.getOriginalWidth());
                 layoutParams.width = requiredWidth;
                 layoutParams.height = resultingHeight;
-                binding.videoPost.playerView.requestLayout();
+                videoPost.playerView.requestLayout();
             }
 
             @Override
@@ -1245,9 +1079,9 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 final FragmentActivity activity = getActivity();
                 if (activity == null) return;
                 Utils.enabledKeepScreenOn(activity);
-                if (detailsVisible) {
-                    new Handler().postDelayed(() -> toggleDetails(), DETAILS_HIDE_DELAY_MILLIS);
-                }
+                // if (detailsVisible) {
+                //     new Handler().postDelayed(() -> toggleDetails(), DETAILS_HIDE_DELAY_MILLIS);
+                // }
             }
 
             @Override
@@ -1263,6 +1097,16 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
                 if (activity == null) return;
                 Utils.disableKeepScreenOn(activity);
             }
+
+            @Override
+            public void onFullScreenModeChanged(final boolean isFullScreen, final StyledPlayerView playerView) {
+                PostViewV2Fragment.this.playerView = playerView;
+                if (isFullScreen) {
+                    hideSystemUI();
+                    return;
+                }
+                showSystemUI();
+            }
         };
         final float aspectRatio = (float) media.getOriginalWidth() / media.getOriginalHeight();
         String videoUrl = null;
@@ -1276,103 +1120,16 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         if (videoUrl != null) {
             videoPlayerViewHelper = new VideoPlayerViewHelper(
                     binding.getRoot().getContext(),
-                    binding.videoPost,
+                    videoPost,
                     videoUrl,
                     vol,
                     aspectRatio,
                     ResponseBodyUtils.getThumbUrl(media),
                     true,
-                    binding.playerControls,
                     videoPlayerCallback);
         }
     }
 
-    private void enablePlayerControls(final boolean enable) {
-        video = enable;
-        if (enable) {
-            binding.playerControlsToggle.setVisibility(View.VISIBLE);
-            binding.playerControlsToggle.setOnClickListener(v -> {
-                final int visibility = binding.playerControls.getRoot().getVisibility();
-                if (visibility == View.GONE) {
-                    showPlayerControls();
-                    return;
-                }
-                hidePlayerControls();
-            });
-            return;
-        }
-        binding.playerControlsToggle.setVisibility(View.GONE);
-        hidePlayerControls();
-    }
-
-    private void hideCaption() {
-        if (bottomSheetBehavior == null) return;
-        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
-    }
-
-    private void showPlayerControls() {
-        hideCaption();
-        // previously invisible view
-        View view = binding.playerControls.getRoot();
-        if (view.getVisibility() == View.VISIBLE) {
-            return;
-        }
-        if (!ViewCompat.isAttachedToWindow(view)) {
-            view.setVisibility(View.VISIBLE);
-            return;
-        }
-        // get the center for the clipping circle
-        int cx = view.getWidth() / 2;
-        // int cy = view.getHeight() / 2;
-        int cy = view.getHeight();
-
-        // get the final radius for the clipping circle
-        float finalRadius = (float) Math.hypot(cx, cy);
-
-        // create the animator for this view (the start radius is zero)
-        Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy, 0f, finalRadius);
-
-        // make the view visible and start the animation
-        view.setVisibility(View.VISIBLE);
-        anim.start();
-
-    }
-
-    private void hidePlayerControls() {
-        // previously visible view
-        final View view = binding.playerControls.getRoot();
-        if (view.getVisibility() == View.GONE) {
-            return;
-        }
-        if (!ViewCompat.isAttachedToWindow(view)) {
-            view.setVisibility(View.GONE);
-            return;
-        }
-
-        // get the center for the clipping circle
-        int cx = view.getWidth() / 2;
-        // int cy = view.getHeight() / 2;
-        int cy = view.getHeight();
-
-        // get the initial radius for the clipping circle
-        float initialRadius = (float) Math.hypot(cx, cy);
-
-        // create the animation (the final radius is zero)
-        Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy, initialRadius, 0f);
-
-        // make the view invisible when the animation is done
-        anim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-                view.setVisibility(View.GONE);
-            }
-        });
-
-        // start the animation
-        anim.start();
-    }
-
     private void setupOptions(final Boolean show) {
         if (!show) {
             binding.options.setVisibility(View.GONE);
@@ -1387,6 +1144,8 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
 
     private void createOptionsPopupMenu() {
         if (optionsPopup == null) {
+            final Context context = getContext();
+            if (context == null) return;
             final ContextThemeWrapper themeWrapper = new ContextThemeWrapper(context, R.style.popupMenuStyle);
             optionsPopup = new PopupMenu(themeWrapper, binding.options);
         } else {
@@ -1503,82 +1262,111 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
     }
 
     private void toggleDetails() {
-        hasBeenToggled = true;
+        final boolean hasBeenToggled = true;
         final Media media = viewModel.getMedia();
         binding.getRoot().post(() -> {
             TransitionManager.beginDelayedTransition(binding.getRoot());
             if (detailsVisible) {
+                final Context context = getContext();
+                if (context == null) return;
+                originalRootBackground = binding.getRoot().getBackground();
+                final Resources resources = context.getResources();
+                if (resources == null) return;
+                final ColorDrawable colorDrawable = new ColorDrawable(resources.getColor(R.color.black));
+                binding.getRoot().setBackground(colorDrawable);
+                if (postView != null) {
+                    // Make post match parent
+                    final ViewGroup.LayoutParams layoutParams = postView.getLayoutParams();
+                    final int fullHeight = Utils.displayMetrics.heightPixels + Utils.getNavigationBarSize(context).y;
+                    layoutParams.height = fullHeight;
+                    binding.contentRoot.getLayoutParams().height = fullHeight;
+                    if (playerView != null) {
+                        playerViewOriginalHeight = playerView.getLayoutParams().height;
+                        playerView.getLayoutParams().height = fullHeight;
+                    }
+                }
                 detailsVisible = false;
                 if (media.getUser() != null) {
                     binding.profilePic.setVisibility(View.GONE);
                     binding.title.setVisibility(View.GONE);
                     binding.subtitle.setVisibility(View.GONE);
-                    binding.topBg.setVisibility(View.GONE);
                 }
                 if (media.getLocation() != null) {
                     binding.location.setVisibility(View.GONE);
                 }
-                binding.captionParent.setVisibility(View.GONE);
-                binding.bottomBg.setVisibility(View.GONE);
-                binding.likesCount.setVisibility(View.GONE);
-                binding.commentsCount.setVisibility(View.GONE);
-                binding.date.setVisibility(View.GONE);
-                binding.comment.setVisibility(View.GONE);
-                binding.captionToggle.setVisibility(View.GONE);
-                binding.playerControlsToggle.setVisibility(View.GONE);
-                binding.like.setVisibility(View.GONE);
-                binding.save.setVisibility(View.GONE);
-                binding.share.setVisibility(View.GONE);
-                binding.download.setVisibility(View.GONE);
+                if (media.getCaption() != null && !TextUtils.isEmpty(media.getCaption().getText())) {
+                    bottom.caption.setVisibility(View.GONE);
+                    bottom.translate.setVisibility(View.GONE);
+                }
+                bottom.likesCount.setVisibility(View.GONE);
+                bottom.commentsCount.setVisibility(View.GONE);
+                bottom.date.setVisibility(View.GONE);
+                bottom.comment.setVisibility(View.GONE);
+                bottom.like.setVisibility(View.GONE);
+                bottom.save.setVisibility(View.GONE);
+                bottom.share.setVisibility(View.GONE);
+                bottom.download.setVisibility(View.GONE);
                 binding.mediaCounter.setVisibility(View.GONE);
-                binding.viewsCount.setVisibility(View.GONE);
+                bottom.viewsCount.setVisibility(View.GONE);
                 final List<Integer> options = viewModel.getOptions().getValue();
                 if (options != null && !options.isEmpty()) {
                     binding.options.setVisibility(View.GONE);
                 }
-                wasControlsVisible = binding.playerControls.getRoot().getVisibility() == View.VISIBLE;
-                if (wasControlsVisible) {
-                    hidePlayerControls();
-                }
                 return;
             }
+            if (originalRootBackground != null) {
+                binding.getRoot().setBackground(originalRootBackground);
+            }
+            if (postView != null) {
+                // Make post height back to original
+                final ViewGroup.LayoutParams layoutParams = postView.getLayoutParams();
+                layoutParams.height = originalHeight;
+                binding.contentRoot.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+                if (playerView != null) {
+                    playerView.getLayoutParams().height = playerViewOriginalHeight;
+                    playerView = null;
+                }
+            }
             if (media.getUser() != null) {
                 binding.profilePic.setVisibility(View.VISIBLE);
                 binding.title.setVisibility(View.VISIBLE);
                 binding.subtitle.setVisibility(View.VISIBLE);
-                binding.topBg.setVisibility(View.VISIBLE);
+                // binding.topBg.setVisibility(View.VISIBLE);
             }
             if (media.getLocation() != null) {
                 binding.location.setVisibility(View.VISIBLE);
             }
-            binding.bottomBg.setVisibility(View.VISIBLE);
+            if (media.getCaption() != null && !TextUtils.isEmpty(media.getCaption().getText())) {
+                bottom.caption.setVisibility(View.VISIBLE);
+                bottom.translate.setVisibility(View.VISIBLE);
+            }
             if (viewModel.hasPk()) {
-                binding.likesCount.setVisibility(View.VISIBLE);
-                binding.date.setVisibility(View.VISIBLE);
-                binding.captionParent.setVisibility(View.VISIBLE);
-                binding.captionToggle.setVisibility(View.VISIBLE);
-                binding.share.setVisibility(View.VISIBLE);
+                bottom.likesCount.setVisibility(View.VISIBLE);
+                bottom.date.setVisibility(View.VISIBLE);
+                // binding.captionParent.setVisibility(View.VISIBLE);
+                // binding.captionToggle.setVisibility(View.VISIBLE);
+                bottom.share.setVisibility(View.VISIBLE);
             }
             if (viewModel.hasPk() && !viewModel.getMedia().isCommentsDisabled()) {
-                binding.comment.setVisibility(View.VISIBLE);
-                binding.commentsCount.setVisibility(View.VISIBLE);
+                bottom.comment.setVisibility(View.VISIBLE);
+                bottom.commentsCount.setVisibility(View.VISIBLE);
             }
-            binding.download.setVisibility(View.VISIBLE);
+            bottom.download.setVisibility(View.VISIBLE);
             final List<Integer> options = viewModel.getOptions().getValue();
             if (options != null && !options.isEmpty()) {
                 binding.options.setVisibility(View.VISIBLE);
             }
             if (viewModel.isLoggedIn() && viewModel.hasPk()) {
-                binding.like.setVisibility(View.VISIBLE);
-                binding.save.setVisibility(View.VISIBLE);
+                bottom.like.setVisibility(View.VISIBLE);
+                bottom.save.setVisibility(View.VISIBLE);
             }
             if (video) {
-                binding.playerControlsToggle.setVisibility(View.VISIBLE);
-                binding.viewsCount.setVisibility(View.VISIBLE);
-            }
-            if (wasControlsVisible) {
-                showPlayerControls();
+                // binding.playerControlsToggle.setVisibility(View.VISIBLE);
+                bottom.viewsCount.setVisibility(View.VISIBLE);
             }
+            // if (wasControlsVisible) {
+            //     showPlayerControls();
+            // }
             if (media.getMediaType() == MediaItemType.MEDIA_TYPE_SLIDER) {
                 binding.mediaCounter.setVisibility(View.VISIBLE);
             }
@@ -1586,15 +1374,63 @@ public class PostViewV2Fragment extends SharedElementTransitionDialogFragment im
         });
     }
 
-    // private void animateY(final View v,
-    //                       final float finalY,
-    //                       final int duration,
-    //                       final AnimatorListenerAdapter listener) {
-    //     v.animate()
-    //      .y(finalY)
-    //      .setDuration(duration)
-    //      .setListener(listener).start();
-    // }
+    private void hideSystemUI() {
+        if (detailsVisible) {
+            toggleDetails();
+        }
+        final MainActivity activity = (MainActivity) getActivity();
+        if (activity == null) return;
+        final ActionBar actionBar = activity.getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.hide();
+        }
+        final CollapsingToolbarLayout appbarLayout = activity.getCollapsingToolbarView();
+        if (appbarLayout != null) {
+            appbarLayout.setVisibility(View.GONE);
+        }
+        final Toolbar toolbar = activity.getToolbar();
+        if (toolbar != null) {
+            toolbar.setVisibility(View.GONE);
+        }
+        final View decorView = activity.getWindow().getDecorView();
+        originalSystemUi = decorView.getSystemUiVisibility();
+        decorView.setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_IMMERSIVE
+                        // Set the content to appear under the system bars so that the
+                        // content doesn't resize when the system bars hide and show.
+                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        // Hide the nav bar and status bar
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN);
+        isInFullScreenMode = true;
+    }
+
+    // Shows the system bars by removing all the flags
+    // except for the ones that make the content appear under the system bars.
+    private void showSystemUI() {
+        if (!detailsVisible) {
+            toggleDetails();
+        }
+        final MainActivity activity = (MainActivity) getActivity();
+        if (activity == null) return;
+        final ActionBar actionBar = activity.getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.show();
+        }
+        final CollapsingToolbarLayout appbarLayout = activity.getCollapsingToolbarView();
+        if (appbarLayout != null) {
+            appbarLayout.setVisibility(View.VISIBLE);
+        }
+        final Toolbar toolbar = activity.getToolbar();
+        if (toolbar != null) {
+            toolbar.setVisibility(View.VISIBLE);
+        }
+        final View decorView = activity.getWindow().getDecorView();
+        decorView.setSystemUiVisibility(originalSystemUi);
+        isInFullScreenMode = false;
+    }
 
     private void navigateToProfile(final String username) {
         final NavController navController = getNavController();
diff --git a/app/src/main/java/awais/instagrabber/fragments/SavedCollectionsFragment.java b/app/src/main/java/awais/instagrabber/fragments/SavedCollectionsFragment.java
index b7b0ed5c..880aae27 100644
--- a/app/src/main/java/awais/instagrabber/fragments/SavedCollectionsFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/SavedCollectionsFragment.java
@@ -41,7 +41,7 @@ import awais.instagrabber.webservices.ServiceCallback;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
 public class SavedCollectionsFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
-    private static final String TAG = "SavedCollectionsFragment";
+    private static final String TAG = SavedCollectionsFragment.class.getSimpleName();
     public static boolean pleaseRefresh = false;
 
     private MainActivity fragmentActivity;
@@ -147,13 +147,16 @@ public class SavedCollectionsFragment extends Fragment implements SwipeRefreshLa
             if (isSaving) {
                 setNavControllerResult(navController, topicCluster.getId());
                 navController.navigateUp();
-            }
-            else {
-                final FragmentNavigator.Extras.Builder builder = new FragmentNavigator.Extras.Builder()
-                        .addSharedElement(cover, "collection-" + topicCluster.getId());
-                final SavedCollectionsFragmentDirections.ActionSavedCollectionsFragmentToCollectionPostsFragment action = SavedCollectionsFragmentDirections
-                        .actionSavedCollectionsFragmentToCollectionPostsFragment(topicCluster, titleColor, backgroundColor);
-                navController.navigate(action, builder.build());
+            } else {
+                try {
+                    final FragmentNavigator.Extras.Builder builder = new FragmentNavigator.Extras.Builder()
+                            .addSharedElement(cover, "collection-" + topicCluster.getId());
+                    final SavedCollectionsFragmentDirections.ActionSavedCollectionsFragmentToCollectionPostsFragment action = SavedCollectionsFragmentDirections
+                            .actionSavedCollectionsFragmentToCollectionPostsFragment(topicCluster, titleColor, backgroundColor);
+                    navController.navigate(action, builder.build());
+                } catch (Exception e) {
+                    Log.e(TAG, "setupTopics: ", e);
+                }
             }
         });
         binding.topicsRecyclerView.setAdapter(adapter);
diff --git a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
index b6ee5431..8ae5a963 100644
--- a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -50,6 +51,7 @@ import static awais.instagrabber.utils.DownloadUtils.WRITE_PERMISSION;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
 public final class SavedViewerFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
+    private static final String TAG = SavedViewerFragment.class.getSimpleName();
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
     private static final int STORAGE_PERM_REQUEST_CODE_FOR_SELECTION = 8030;
 
@@ -171,16 +173,15 @@ public final class SavedViewerFragment extends Fragment implements SwipeRefreshL
                                     final View profilePicView,
                                     final View mainPostImage,
                                     final int position) {
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment
-                    .builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(SavedViewerFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
         }
     };
     private final FeedAdapterV2.SelectionModeCallback selectionModeCallback = new FeedAdapterV2.SelectionModeCallback() {
diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryListViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryListViewerFragment.java
index ee997c86..f4bf129a 100644
--- a/app/src/main/java/awais/instagrabber/fragments/StoryListViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/StoryListViewerFragment.java
@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import awais.instagrabber.R;
@@ -50,12 +51,15 @@ public final class StoryListViewerFragment extends Fragment implements SwipeRefr
     private AppCompatActivity fragmentActivity;
     private FragmentStoryListViewerBinding binding;
     private SwipeRefreshLayout root;
-    private boolean shouldRefresh = true, firstRefresh = true;
+    private boolean shouldRefresh = true;
+    private boolean firstRefresh = true;
     private FeedStoriesViewModel feedStoriesViewModel;
     private ArchivesViewModel archivesViewModel;
     private StoriesService storiesService;
     private Context context;
-    private String type, currentQuery, endCursor = null;
+    private String type;
+    private String currentQuery;
+    private String endCursor = null;
     private FeedStoriesListAdapter adapter;
     private MenuItem menuSearch;
 
@@ -98,8 +102,7 @@ public final class StoryListViewerFragment extends Fragment implements SwipeRefr
                     final Context context = getContext();
                     Toast.makeText(context, R.string.empty_list, Toast.LENGTH_SHORT).show();
                 } catch (Exception ignored) {}
-            }
-            else {
+            } else {
                 endCursor = result.getNextCursor();
                 final List<HighlightModel> models = archivesViewModel.getList().getValue();
                 final List<HighlightModel> modelsCopy = models == null ? new ArrayList<>() : new ArrayList<>(models);
@@ -198,7 +201,13 @@ public final class StoryListViewerFragment extends Fragment implements SwipeRefr
             adapter = new FeedStoriesListAdapter(clickListener);
             binding.rvStories.setLayoutManager(layoutManager);
             binding.rvStories.setAdapter(adapter);
-            feedStoriesViewModel.getList().observe(getViewLifecycleOwner(), adapter::submitList);
+            feedStoriesViewModel.getList().observe(getViewLifecycleOwner(), list -> {
+                if (list == null) {
+                    adapter.submitList(Collections.emptyList());
+                    return;
+                }
+                adapter.submitList(list);
+            });
         } else {
             if (actionBar != null) actionBar.setTitle(R.string.action_archive);
             final RecyclerLazyLoader lazyLoader = new RecyclerLazyLoader(layoutManager, (page, totalItemsCount) -> {
@@ -220,7 +229,10 @@ public final class StoryListViewerFragment extends Fragment implements SwipeRefr
         binding.swipeRefreshLayout.setRefreshing(true);
         if (type.equals("feed") && firstRefresh) {
             binding.swipeRefreshLayout.setRefreshing(false);
-            adapter.submitList(feedStoriesViewModel.getList().getValue());
+            final List<FeedStoryModel> value = feedStoriesViewModel.getList().getValue();
+            if (value != null) {
+                adapter.submitList(value);
+            }
             firstRefresh = false;
         } else if (type.equals("feed")) {
             storiesService.getFeedStories(new ServiceCallback<List<FeedStoryModel>>() {
diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
index 82438999..1372eb59 100644
--- a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
@@ -2,14 +2,12 @@ package awais.instagrabber.fragments;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Animatable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
-import android.util.Pair;
 import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -37,6 +35,7 @@ import androidx.core.view.GestureDetectorCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -72,7 +71,6 @@ import awais.instagrabber.BuildConfig;
 import awais.instagrabber.R;
 import awais.instagrabber.adapters.StoriesAdapter;
 import awais.instagrabber.asyncs.CreateThreadAction;
-import awais.instagrabber.asyncs.PostFetcher;
 import awais.instagrabber.customviews.helpers.SwipeGestureListener;
 import awais.instagrabber.databinding.FragmentStoryViewerBinding;
 import awais.instagrabber.fragments.main.ProfileFragmentDirections;
@@ -105,7 +103,6 @@ import awais.instagrabber.webservices.DirectMessagesService;
 import awais.instagrabber.webservices.MediaService;
 import awais.instagrabber.webservices.ServiceCallback;
 import awais.instagrabber.webservices.StoriesService;
-//import awaisomereport.LogCollector;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -113,7 +110,6 @@ import retrofit2.Response;
 import static awais.instagrabber.customviews.helpers.SwipeGestureListener.SWIPE_THRESHOLD;
 import static awais.instagrabber.customviews.helpers.SwipeGestureListener.SWIPE_VELOCITY_THRESHOLD;
 import static awais.instagrabber.utils.Constants.MARK_AS_SEEN;
-//import static awais.instagrabber.utils.Utils.logCollector;
 import static awais.instagrabber.utils.Utils.settingsHelper;
 
 public class StoryViewerFragment extends Fragment {
@@ -137,14 +133,14 @@ public class StoryViewerFragment extends Fragment {
     private String[] mentions;
     private QuizModel quiz;
     private SliderModel slider;
-    private MenuItem menuDownload;
-    private MenuItem menuDm;
+    private MenuItem menuDownload, menuDm, menuProfile;
     private SimpleExoPlayer player;
     // private boolean isHashtag;
     // private boolean isLoc;
     // private String highlight;
-    private String actionBarTitle;
+    private String actionBarTitle, actionBarSubtitle;
     private boolean fetching = false, sticking = false, shouldRefresh = true;
+    private boolean downloadVisible = false, dmVisible = false, profileVisible = true;
     private int currentFeedStoryIndex;
     private double sliderValue;
     private StoriesViewModel storiesViewModel;
@@ -195,8 +191,10 @@ public class StoryViewerFragment extends Fragment {
         menuInflater.inflate(R.menu.story_menu, menu);
         menuDownload = menu.findItem(R.id.action_download);
         menuDm = menu.findItem(R.id.action_dms);
-        menuDownload.setVisible(false);
-        menuDm.setVisible(false);
+        menuProfile = menu.findItem(R.id.action_profile);
+        menuDownload.setVisible(downloadVisible);
+        menuDm.setVisible(dmVisible);
+        menuProfile.setVisible(profileVisible);
     }
 
     @Override
@@ -215,7 +213,8 @@ public class StoryViewerFragment extends Fragment {
             else
                 ActivityCompat.requestPermissions(requireActivity(), DownloadUtils.PERMS, 8020);
             return true;
-        } else if (itemId == R.id.action_dms) {
+        }
+        if (itemId == R.id.action_dms) {
             final EditText input = new EditText(context);
             input.setHint(R.string.reply_hint);
             new AlertDialog.Builder(context)
@@ -259,6 +258,9 @@ public class StoryViewerFragment extends Fragment {
                     .show();
             return true;
         }
+        if (itemId == R.id.action_profile) {
+            openProfile("@" + currentStory.getUsername());
+        }
         return false;
     }
 
@@ -281,7 +283,9 @@ public class StoryViewerFragment extends Fragment {
         final ActionBar actionBar = fragmentActivity.getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(actionBarTitle);
+            actionBar.setSubtitle(actionBarSubtitle);
         }
+        setHasOptionsMenu(true);
     }
 
     @Override
@@ -409,10 +413,10 @@ public class StoryViewerFragment extends Fragment {
                         return true;
                     }
                 } catch (final Exception e) {
-//                    if (logCollector != null)
-//                        logCollector.appendException(e, LogCollector.LogFile.ACTIVITY_STORY_VIEWER, "setupListeners",
-//                                                     new Pair<>("swipeEvent", swipeEvent),
-//                                                     new Pair<>("diffX", diffX));
+                    // if (logCollector != null)
+                    //     logCollector.appendException(e, LogCollector.LogFile.ACTIVITY_STORY_VIEWER, "setupListeners",
+                    //                                  new Pair<>("swipeEvent", swipeEvent),
+                    //                                  new Pair<>("diffX", diffX));
                     if (BuildConfig.DEBUG) Log.e(TAG, "Error", e);
                 }
                 return false;
@@ -453,14 +457,17 @@ public class StoryViewerFragment extends Fragment {
                     .setView(R.layout.dialog_opening_post)
                     .create();
             alertDialog.show();
-            mediaService.fetch(Long.valueOf(mediaId), new ServiceCallback<Media>() {
+            mediaService.fetch(Long.parseLong(mediaId), new ServiceCallback<Media>() {
                 @Override
                 public void onSuccess(final Media feedModel) {
-                    final PostViewV2Fragment fragment = PostViewV2Fragment
-                            .builder(feedModel)
-                            .build();
-                    fragment.setOnShowListener(dialog -> alertDialog.dismiss());
-                    fragment.show(getChildFragmentManager(), "post_view");
+                    final NavController navController = NavHostFragment.findNavController(StoryViewerFragment.this);
+                    final Bundle bundle = new Bundle();
+                    bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+                    try {
+                        navController.navigate(R.id.action_global_post_view, bundle);
+                    } catch (Exception e) {
+                        Log.e(TAG, "openPostDialog: ", e);
+                    }
                 }
 
                 @Override
@@ -475,18 +482,18 @@ public class StoryViewerFragment extends Fragment {
             if (tag instanceof PollModel) {
                 poll = (PollModel) tag;
                 if (poll.getMyChoice() > -1) {
-                    new AlertDialog.Builder(context).setTitle(R.string.voted_story_poll)
-                                                    .setAdapter(new ArrayAdapter<>(context, android.R.layout.simple_list_item_1,
-                                                                                   new String[]{
-                                                                                           (poll.getMyChoice() == 0 ? "√ " : "") + poll
-                                                                                                   .getLeftChoice() + " (" + poll
-                                                                                                   .getLeftCount() + ")",
-                                                                                           (poll.getMyChoice() == 1 ? "√ " : "") + poll
-                                                                                                   .getRightChoice() + " (" + poll
-                                                                                                   .getRightCount() + ")"
-                                                                                   }), null)
-                                                    .setPositiveButton(R.string.ok, null)
-                                                    .show();
+                    new AlertDialog.Builder(context)
+                            .setTitle(R.string.voted_story_poll)
+                            .setAdapter(new ArrayAdapter<>(
+                                                context,
+                                                android.R.layout.simple_list_item_1,
+                                                new String[]{
+                                                        (poll.getMyChoice() == 0 ? "√ " : "") + poll.getLeftChoice() + " (" + poll.getLeftCount() + ")",
+                                                        (poll.getMyChoice() == 1 ? "√ " : "") + poll.getRightChoice() + " (" + poll.getRightCount() + ")"
+                                                }),
+                                        null)
+                            .setPositiveButton(R.string.ok, null)
+                            .show();
                 } else {
                     new AlertDialog.Builder(context)
                             .setTitle(poll.getQuestion())
@@ -697,6 +704,10 @@ public class StoryViewerFragment extends Fragment {
         lastSlidePos = 0;
         if (menuDownload != null) menuDownload.setVisible(false);
         if (menuDm != null) menuDm.setVisible(false);
+        if (menuProfile != null) menuProfile.setVisible(false);
+        downloadVisible = false;
+        dmVisible = false;
+        profileVisible = false;
         binding.imageViewer.setController(null);
         releasePlayer();
         String currentStoryMediaId = null;
@@ -826,7 +837,7 @@ public class StoryViewerFragment extends Fragment {
         }
     }
 
-    private void refreshStory() {
+    private synchronized void refreshStory() {
         if (binding.storiesList.getVisibility() == View.VISIBLE) {
             final List<StoryModel> storyModels = storiesViewModel.getList().getValue();
             if (storyModels != null && storyModels.size() > 0) {
@@ -846,7 +857,6 @@ public class StoryViewerFragment extends Fragment {
 
         final MediaItemType itemType = currentStory.getItemType();
 
-        if (menuDownload != null) menuDownload.setVisible(false);
         url = itemType == MediaItemType.MEDIA_TYPE_IMAGE ? currentStory.getStoryUrl() : currentStory.getVideoUrl();
 
         if (itemType != MediaItemType.MEDIA_TYPE_LIVE) {
@@ -900,9 +910,10 @@ public class StoryViewerFragment extends Fragment {
         else setupImage();
 
         final ActionBar actionBar = fragmentActivity.getSupportActionBar();
+        actionBarSubtitle = Utils.datetimeParser.format(new Date(currentStory.getTimestamp() * 1000L));
         if (actionBar != null) {
             try {
-                actionBar.setSubtitle(Utils.datetimeParser.format(new Date(currentStory.getTimestamp() * 1000L)));
+                actionBar.setSubtitle(actionBarSubtitle);
             } catch (Exception e) {
                 Log.e(TAG, "refreshStory: ", e);
             }
@@ -948,11 +959,17 @@ public class StoryViewerFragment extends Fragment {
                                                                                   final ImageInfo imageInfo,
                                                                                   final Animatable animatable) {
                                                           if (menuDownload != null) {
+                                                              downloadVisible = true;
                                                               menuDownload.setVisible(true);
                                                           }
                                                           if (currentStory.canReply() && menuDm != null) {
+                                                              dmVisible = true;
                                                               menuDm.setVisible(true);
                                                           }
+                                                          if (!TextUtils.isEmpty(currentStory.getUsername())) {
+                                                              profileVisible = true;
+                                                              menuProfile.setVisible(true);
+                                                          }
                                                           binding.progressView.setVisibility(View.GONE);
                                                       }
                                                   })
@@ -982,9 +999,18 @@ public class StoryViewerFragment extends Fragment {
                                         @Nullable final MediaSource.MediaPeriodId mediaPeriodId,
                                         @NonNull final LoadEventInfo loadEventInfo,
                                         @NonNull final MediaLoadData mediaLoadData) {
-                if (menuDownload != null) menuDownload.setVisible(true);
-                if (currentStory.canReply() && menuDm != null)
+                if (menuDownload != null) {
+                    downloadVisible = true;
+                    menuDownload.setVisible(true);
+                }
+                if (currentStory.canReply() && menuDm != null) {
+                    dmVisible = true;
                     menuDm.setVisible(true);
+                }
+                if (!TextUtils.isEmpty(currentStory.getUsername()) && menuProfile != null) {
+                    profileVisible = true;
+                    menuProfile.setVisible(true);
+                }
                 binding.progressView.setVisibility(View.GONE);
             }
 
@@ -993,9 +1019,18 @@ public class StoryViewerFragment extends Fragment {
                                       @Nullable final MediaSource.MediaPeriodId mediaPeriodId,
                                       @NonNull final LoadEventInfo loadEventInfo,
                                       @NonNull final MediaLoadData mediaLoadData) {
-                if (menuDownload != null) menuDownload.setVisible(true);
-                if (currentStory.canReply() && menuDm != null)
+                if (menuDownload != null) {
+                    downloadVisible = true;
+                    menuDownload.setVisible(true);
+                }
+                if (currentStory.canReply() && menuDm != null) {
+                    dmVisible = true;
                     menuDm.setVisible(true);
+                }
+                if (!TextUtils.isEmpty(currentStory.getUsername()) && menuProfile != null) {
+                    profileVisible = true;
+                    menuProfile.setVisible(true);
+                }
                 binding.progressView.setVisibility(View.VISIBLE);
             }
 
@@ -1014,8 +1049,18 @@ public class StoryViewerFragment extends Fragment {
                                     @NonNull final MediaLoadData mediaLoadData,
                                     @NonNull final IOException error,
                                     final boolean wasCanceled) {
-                if (menuDownload != null) menuDownload.setVisible(false);
-                if (menuDm != null) menuDm.setVisible(false);
+                if (menuDownload != null) {
+                    downloadVisible = false;
+                    menuDownload.setVisible(false);
+                }
+                if (menuDm != null) {
+                    dmVisible = false;
+                    menuDm.setVisible(false);
+                }
+                if (menuProfile != null) {
+                    profileVisible = false;
+                    menuProfile.setVisible(false);
+                }
                 binding.progressView.setVisibility(View.GONE);
             }
         });
@@ -1095,7 +1140,6 @@ public class StoryViewerFragment extends Fragment {
         });
     }
 
-
     private void openProfile(final String username) {
         final ActionBar actionBar = fragmentActivity.getSupportActionBar();
         if (actionBar != null) {
diff --git a/app/src/main/java/awais/instagrabber/fragments/TopicPostsFragment.java b/app/src/main/java/awais/instagrabber/fragments/TopicPostsFragment.java
index 9b680d64..76374891 100644
--- a/app/src/main/java/awais/instagrabber/fragments/TopicPostsFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/TopicPostsFragment.java
@@ -10,6 +10,7 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -51,8 +52,8 @@ import awais.instagrabber.databinding.FragmentTopicPostsBinding;
 import awais.instagrabber.dialogs.PostsLayoutPreferencesDialogFragment;
 import awais.instagrabber.fragments.main.DiscoverFragmentDirections;
 import awais.instagrabber.models.PostsLayoutPreferences;
-import awais.instagrabber.repositories.responses.discover.TopicCluster;
 import awais.instagrabber.repositories.responses.Media;
+import awais.instagrabber.repositories.responses.discover.TopicCluster;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.DownloadUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
@@ -63,6 +64,7 @@ import static androidx.core.content.PermissionChecker.checkSelfPermission;
 import static awais.instagrabber.utils.DownloadUtils.WRITE_PERMISSION;
 
 public class TopicPostsFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
+    private static final String TAG = TopicPostsFragment.class.getSimpleName();
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
     private static final int STORAGE_PERM_REQUEST_CODE_FOR_SELECTION = 8030;
 
@@ -182,16 +184,15 @@ public class TopicPostsFragment extends Fragment implements SwipeRefreshLayout.O
                                     final View profilePicView,
                                     final View mainPostImage,
                                     final int position) {
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment
-                    .builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(TopicPostsFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
         }
     };
     private final FeedAdapterV2.SelectionModeCallback selectionModeCallback = new FeedAdapterV2.SelectionModeCallback() {
diff --git a/app/src/main/java/awais/instagrabber/fragments/comments/CommentsViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/comments/CommentsViewerFragment.java
new file mode 100644
index 00000000..aa70ad25
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/fragments/comments/CommentsViewerFragment.java
@@ -0,0 +1,237 @@
+package awais.instagrabber.fragments.comments;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.style.RelativeSizeSpan;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.snackbar.Snackbar;
+
+import java.util.Collections;
+import java.util.List;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.CommentsAdapter;
+import awais.instagrabber.customviews.helpers.RecyclerLazyLoader;
+import awais.instagrabber.databinding.FragmentCommentsBinding;
+import awais.instagrabber.models.Comment;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.utils.TextUtils;
+import awais.instagrabber.viewmodels.AppStateViewModel;
+import awais.instagrabber.viewmodels.CommentsViewerViewModel;
+
+public final class CommentsViewerFragment extends BottomSheetDialogFragment {
+    private static final String TAG = CommentsViewerFragment.class.getSimpleName();
+
+    private CommentsViewerViewModel viewModel;
+    private CommentsAdapter commentsAdapter;
+    private FragmentCommentsBinding binding;
+    private ConstraintLayout root;
+    private boolean shouldRefresh = true;
+    private AppStateViewModel appStateViewModel;
+    private boolean showingReplies;
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final Dialog dialog = getDialog();
+        if (dialog == null) return;
+        final BottomSheetDialog bottomSheetDialog = (BottomSheetDialog) dialog;
+        final View bottomSheetInternal = bottomSheetDialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
+        if (bottomSheetInternal == null) return;
+        bottomSheetInternal.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+        bottomSheetInternal.requestLayout();
+        final BottomSheetBehavior<View> behavior = BottomSheetBehavior.from(bottomSheetInternal);
+        behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+        behavior.setSkipCollapsed(true);
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final FragmentActivity activity = getActivity();
+        if (activity == null) return;
+        viewModel = new ViewModelProvider(this).get(CommentsViewerViewModel.class);
+        appStateViewModel = new ViewModelProvider(activity).get(AppStateViewModel.class);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
+        return new BottomSheetDialog(getContext(), getTheme()) {
+            @Override
+            public void onBackPressed() {
+                if (showingReplies) {
+                    getChildFragmentManager().popBackStack();
+                    showingReplies = false;
+                    return;
+                }
+                super.onBackPressed();
+            }
+        };
+    }
+
+    @NonNull
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
+        if (root != null) {
+            shouldRefresh = false;
+            return root;
+        }
+        binding = FragmentCommentsBinding.inflate(getLayoutInflater());
+        binding.swipeRefreshLayout.setEnabled(false);
+        binding.swipeRefreshLayout.setNestedScrollingEnabled(false);
+        root = binding.getRoot();
+        appStateViewModel.getCurrentUserLiveData().observe(getViewLifecycleOwner(), user -> viewModel.setCurrentUser(user));
+        if (getArguments() == null) return root;
+        final CommentsViewerFragmentArgs args = CommentsViewerFragmentArgs.fromBundle(getArguments());
+        viewModel.setPostDetails(args.getShortCode(), args.getPostId(), args.getPostUserId());
+        return root;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        if (!shouldRefresh) return;
+        shouldRefresh = false;
+        init();
+    }
+
+    private void init() {
+        setupToolbar();
+        setupList();
+        setupObservers();
+    }
+
+    private void setupObservers() {
+        viewModel.getCurrentUserId().observe(getViewLifecycleOwner(), currentUserId -> {
+            long userId = 0;
+            if (currentUserId != null) {
+                userId = currentUserId;
+            }
+            setupAdapter(userId);
+            if (userId == 0) return;
+            Helper.setupCommentInput(binding.commentField, binding.commentText, false, text -> {
+                final LiveData<Resource<Object>> resourceLiveData = viewModel.comment(text, false);
+                resourceLiveData.observe(getViewLifecycleOwner(), new Observer<Resource<Object>>() {
+                    @Override
+                    public void onChanged(final Resource<Object> objectResource) {
+                        if (objectResource == null) return;
+                        final Context context = getContext();
+                        if (context == null) return;
+                        Helper.handleCommentResource(
+                                context,
+                                objectResource.status,
+                                objectResource.message,
+                                resourceLiveData,
+                                this,
+                                binding.commentField,
+                                binding.commentText,
+                                binding.comments);
+                    }
+                });
+                return null;
+            });
+        });
+        viewModel.getRootList().observe(getViewLifecycleOwner(), listResource -> {
+            if (listResource == null) return;
+            switch (listResource.status) {
+                case SUCCESS:
+                    binding.swipeRefreshLayout.setRefreshing(false);
+                    if (commentsAdapter != null) {
+                        commentsAdapter.submitList(listResource.data);
+                    }
+                    break;
+                case ERROR:
+                    binding.swipeRefreshLayout.setRefreshing(false);
+                    if (!TextUtils.isEmpty(listResource.message)) {
+                        Snackbar.make(binding.getRoot(), listResource.message, Snackbar.LENGTH_LONG).show();
+                    }
+                    break;
+                case LOADING:
+                    binding.swipeRefreshLayout.setRefreshing(true);
+                    break;
+            }
+        });
+        viewModel.getRootCommentsCount().observe(getViewLifecycleOwner(), count -> {
+            if (count == null || count == 0) {
+                binding.toolbar.setTitle(R.string.title_comments);
+                return;
+            }
+            final String titleComments = getString(R.string.title_comments);
+            final String countString = String.valueOf(count);
+            final SpannableString titleWithCount = new SpannableString(String.format("%s   %s", titleComments, countString));
+            titleWithCount.setSpan(new RelativeSizeSpan(0.8f),
+                                   titleWithCount.length() - countString.length(),
+                                   titleWithCount.length(),
+                                   Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            binding.toolbar.setTitle(titleWithCount);
+        });
+    }
+
+    private void setupToolbar() {
+        binding.toolbar.setTitle(R.string.title_comments);
+    }
+
+    private void setupAdapter(final long currentUserId) {
+        final Context context = getContext();
+        if (context == null) return;
+        commentsAdapter = new CommentsAdapter(currentUserId, false, Helper.getCommentCallback(
+                context,
+                getViewLifecycleOwner(),
+                getNavController(),
+                viewModel,
+                (comment, focusInput) -> {
+                    if (comment == null) return null;
+                    final RepliesFragment repliesFragment = RepliesFragment.newInstance(comment, focusInput == null ? false : focusInput);
+                    getChildFragmentManager().beginTransaction()
+                                             .setCustomAnimations(R.anim.slide_left, R.anim.slide_right, 0, R.anim.slide_right)
+                                             .add(R.id.replies_container_view, repliesFragment)
+                                             .addToBackStack(RepliesFragment.TAG)
+                                             .commit();
+                    showingReplies = true;
+                    return null;
+                }));
+        final Resource<List<Comment>> listResource = viewModel.getRootList().getValue();
+        binding.comments.setAdapter(commentsAdapter);
+        commentsAdapter.submitList(listResource != null ? listResource.data : Collections.emptyList());
+    }
+
+    private void setupList() {
+        final Context context = getContext();
+        if (context == null) return;
+        final LinearLayoutManager layoutManager = new LinearLayoutManager(context);
+        final RecyclerLazyLoader lazyLoader = new RecyclerLazyLoader(layoutManager, (page, totalItemsCount) -> viewModel.fetchComments());
+        Helper.setupList(context, binding.comments, layoutManager, lazyLoader);
+    }
+
+    @Nullable
+    private NavController getNavController() {
+        NavController navController = null;
+        try {
+            navController = NavHostFragment.findNavController(this);
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "navigateToProfile", e);
+        }
+        return navController;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/fragments/comments/Helper.java b/app/src/main/java/awais/instagrabber/fragments/comments/Helper.java
new file mode 100644
index 00000000..823ffb33
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/fragments/comments/Helper.java
@@ -0,0 +1,288 @@
+package awais.instagrabber.fragments.comments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.Editable;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.navigation.NavController;
+import androidx.navigation.NavDirections;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.internal.CheckableImageButton;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.CommentsAdapter.CommentCallback;
+import awais.instagrabber.customviews.helpers.TextWatcherAdapter;
+import awais.instagrabber.models.Comment;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.utils.TextUtils;
+import awais.instagrabber.utils.Utils;
+import awais.instagrabber.viewmodels.CommentsViewerViewModel;
+import awais.instagrabber.webservices.ServiceCallback;
+
+public final class Helper {
+    private static final String TAG = Helper.class.getSimpleName();
+
+    public static void setupList(@NonNull final Context context,
+                                 @NonNull final RecyclerView list,
+                                 @NonNull final RecyclerView.LayoutManager layoutManager,
+                                 @NonNull final RecyclerView.OnScrollListener lazyLoader) {
+        list.setLayoutManager(layoutManager);
+        final DividerItemDecoration itemDecoration = new DividerItemDecoration(context, LinearLayoutManager.VERTICAL);
+        itemDecoration.setDrawable(ContextCompat.getDrawable(context, R.drawable.pref_list_divider_material));
+        list.addItemDecoration(itemDecoration);
+        list.addOnScrollListener(lazyLoader);
+    }
+
+    @NonNull
+    public static CommentCallback getCommentCallback(@NonNull final Context context,
+                                                     final LifecycleOwner lifecycleOwner,
+                                                     final NavController navController,
+                                                     @NonNull final CommentsViewerViewModel viewModel,
+                                                     final BiFunction<Comment, Boolean, Void> onRepliesClick) {
+        return new CommentCallback() {
+            @Override
+            public void onClick(final Comment comment) {
+                // onCommentClick(comment);
+                if (onRepliesClick == null) return;
+                onRepliesClick.apply(comment, false);
+            }
+
+            @Override
+            public void onHashtagClick(final String hashtag) {
+                try {
+                    if (navController == null) return;
+                    final NavDirections action = CommentsViewerFragmentDirections.actionGlobalHashTagFragment(hashtag);
+                    navController.navigate(action);
+                } catch (Exception e) {
+                    Log.e(TAG, "onHashtagClick: ", e);
+                }
+            }
+
+            @Override
+            public void onMentionClick(final String mention) {
+                openProfile(navController, mention);
+            }
+
+            @Override
+            public void onURLClick(final String url) {
+                Utils.openURL(context, url);
+            }
+
+            @Override
+            public void onEmailClick(final String emailAddress) {
+                Utils.openEmailAddress(context, emailAddress);
+            }
+
+            @Override
+            public void onLikeClick(final Comment comment, final boolean liked, final boolean isReply) {
+                if (comment == null) return;
+                final LiveData<Resource<Object>> resourceLiveData = viewModel.likeComment(comment, liked, isReply);
+                resourceLiveData.observe(lifecycleOwner, new Observer<Resource<Object>>() {
+                    @Override
+                    public void onChanged(final Resource<Object> objectResource) {
+                        if (objectResource == null) return;
+                        switch (objectResource.status) {
+                            case SUCCESS:
+                                resourceLiveData.removeObserver(this);
+                                break;
+                            case LOADING:
+                                break;
+                            case ERROR:
+                                if (objectResource.message != null) {
+                                    Toast.makeText(context, objectResource.message, Toast.LENGTH_LONG).show();
+                                }
+                                resourceLiveData.removeObserver(this);
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onRepliesClick(final Comment comment) {
+                // viewModel.showReplies(comment);
+                if (onRepliesClick == null) return;
+                onRepliesClick.apply(comment, true);
+            }
+
+            @Override
+            public void onViewLikes(final Comment comment) {
+                if (navController == null) return;
+                try {
+                    final Bundle bundle = new Bundle();
+                    bundle.putString("postId", comment.getId());
+                    bundle.putBoolean("isComment", true);
+                    navController.navigate(R.id.action_global_likesViewerFragment, bundle);
+                } catch (Exception e) {
+                    Log.e(TAG, "onViewLikes: ", e);
+                }
+            }
+
+            @Override
+            public void onTranslate(final Comment comment) {
+                if (comment == null) return;
+                viewModel.translate(comment, new ServiceCallback<String>() {
+                    @Override
+                    public void onSuccess(final String result) {
+                        if (TextUtils.isEmpty(result)) {
+                            Toast.makeText(context, R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
+                            return;
+                        }
+                        String username = "";
+                        if (comment.getUser() != null) {
+                            username = comment.getUser().getUsername();
+                        }
+                        new MaterialAlertDialogBuilder(context)
+                                .setTitle(username)
+                                .setMessage(result)
+                                .setPositiveButton(R.string.ok, null)
+                                .show();
+                    }
+
+                    @Override
+                    public void onFailure(final Throwable t) {
+                        Log.e(TAG, "Error translating comment", t);
+                        Toast.makeText(context, t.getMessage(), Toast.LENGTH_SHORT).show();
+                    }
+                });
+            }
+
+            @Override
+            public void onDelete(final Comment comment, final boolean isReply) {
+                if (comment == null) return;
+                final LiveData<Resource<Object>> resourceLiveData = viewModel.deleteComment(comment, isReply);
+                resourceLiveData.observe(lifecycleOwner, new Observer<Resource<Object>>() {
+                    @Override
+                    public void onChanged(final Resource<Object> objectResource) {
+                        if (objectResource == null) return;
+                        switch (objectResource.status) {
+                            case SUCCESS:
+                                resourceLiveData.removeObserver(this);
+                                break;
+                            case ERROR:
+                                if (objectResource.message != null) {
+                                    Toast.makeText(context, objectResource.message, Toast.LENGTH_LONG).show();
+                                }
+                                resourceLiveData.removeObserver(this);
+                                break;
+                            case LOADING:
+                                break;
+                        }
+                    }
+                });
+            }
+        };
+    }
+
+    private static void openProfile(final NavController navController,
+                                    @NonNull final String username) {
+        if (navController == null) return;
+        try {
+            final NavDirections action = CommentsViewerFragmentDirections.actionGlobalProfileFragment(username);
+            navController.navigate(action);
+        } catch (Exception e) {
+            Log.e(TAG, "openProfile: ", e);
+        }
+    }
+
+    public static void setupCommentInput(@NonNull final TextInputLayout commentField,
+                                         @NonNull final TextInputEditText commentText,
+                                         final boolean isReplyFragment,
+                                         @NonNull final Function<String, Void> commentFunction) {
+        // commentField.setStartIconVisible(false);
+        commentField.setVisibility(View.VISIBLE);
+        commentField.setEndIconVisible(false);
+        if (isReplyFragment) {
+            commentField.setHint(R.string.reply_hint);
+        }
+        commentText.addTextChangedListener(new TextWatcherAdapter() {
+            @Override
+            public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
+                final boolean isEmpty = TextUtils.isEmpty(s);
+                commentField.setStartIconVisible(!isEmpty);
+                commentField.setEndIconVisible(!isEmpty);
+                commentField.setCounterEnabled(s != null && s.length() > 2000); // show the counter when user approaches the limit
+            }
+        });
+        // commentField.setStartIconOnClickListener(v -> {
+        //     // commentsAdapter.clearSelection();
+        //     commentText.setText("");
+        // });
+        commentField.setEndIconOnClickListener(v -> {
+            final Editable text = commentText.getText();
+            if (TextUtils.isEmpty(text)) return;
+            commentFunction.apply(text.toString().trim());
+        });
+    }
+
+    public static void handleCommentResource(@NonNull final Context context,
+                                             @NonNull final Resource.Status status,
+                                             final String message,
+                                             @NonNull final LiveData<Resource<Object>> resourceLiveData,
+                                             @NonNull final Observer<Resource<Object>> observer,
+                                             @NonNull final TextInputLayout commentField,
+                                             @NonNull final TextInputEditText commentText,
+                                             @NonNull final RecyclerView comments) {
+        CheckableImageButton endIcon = null;
+        try {
+            endIcon = (CheckableImageButton) commentField.findViewById(com.google.android.material.R.id.text_input_end_icon);
+        } catch (Exception e) {
+            Log.e(TAG, "setupObservers: ", e);
+        }
+        CheckableImageButton startIcon = null;
+        try {
+            startIcon = (CheckableImageButton) commentField.findViewById(com.google.android.material.R.id.text_input_start_icon);
+        } catch (Exception e) {
+            Log.e(TAG, "setupObservers: ", e);
+        }
+        switch (status) {
+            case SUCCESS:
+                resourceLiveData.removeObserver(observer);
+                comments.postDelayed(() -> comments.scrollToPosition(0), 500);
+                if (startIcon != null) {
+                    startIcon.setEnabled(true);
+                }
+                if (endIcon != null) {
+                    endIcon.setEnabled(true);
+                }
+                commentText.setText("");
+                break;
+            case LOADING:
+                commentText.setEnabled(false);
+                if (startIcon != null) {
+                    startIcon.setEnabled(false);
+                }
+                if (endIcon != null) {
+                    endIcon.setEnabled(false);
+                }
+                break;
+            case ERROR:
+                if (message != null && context != null) {
+                    Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+                }
+                if (startIcon != null) {
+                    startIcon.setEnabled(true);
+                }
+                if (endIcon != null) {
+                    endIcon.setEnabled(true);
+                }
+                resourceLiveData.removeObserver(observer);
+        }
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/fragments/comments/RepliesFragment.java b/app/src/main/java/awais/instagrabber/fragments/comments/RepliesFragment.java
new file mode 100644
index 00000000..67c0f95c
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/fragments/comments/RepliesFragment.java
@@ -0,0 +1,214 @@
+package awais.instagrabber.fragments.comments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.android.material.snackbar.Snackbar;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.CommentsAdapter;
+import awais.instagrabber.customviews.helpers.RecyclerLazyLoader;
+import awais.instagrabber.databinding.FragmentCommentsBinding;
+import awais.instagrabber.models.Comment;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.utils.TextUtils;
+import awais.instagrabber.utils.Utils;
+import awais.instagrabber.viewmodels.CommentsViewerViewModel;
+
+public class RepliesFragment extends Fragment {
+    public static final String TAG = RepliesFragment.class.getSimpleName();
+    private static final String ARG_PARENT = "parent";
+    private static final String ARG_FOCUS_INPUT = "focus";
+
+    private FragmentCommentsBinding binding;
+    private CommentsViewerViewModel viewModel;
+    private CommentsAdapter commentsAdapter;
+
+    @NonNull
+    public static RepliesFragment newInstance(@NonNull final Comment parent,
+                                              final boolean focusInput) {
+        final Bundle args = new Bundle();
+        args.putSerializable(ARG_PARENT, parent);
+        args.putBoolean(ARG_FOCUS_INPUT, focusInput);
+        final RepliesFragment fragment = new RepliesFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        viewModel = new ViewModelProvider(getParentFragment()).get(CommentsViewerViewModel.class);
+        final Bundle bundle = getArguments();
+        if (bundle == null) return;
+        final Serializable serializable = bundle.getSerializable(ARG_PARENT);
+        if (!(serializable instanceof Comment)) return;
+        viewModel.showReplies((Comment) serializable);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
+        binding = FragmentCommentsBinding.inflate(inflater, container, false);
+        binding.swipeRefreshLayout.setEnabled(false);
+        binding.swipeRefreshLayout.setNestedScrollingEnabled(false);
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        setupToolbar();
+    }
+
+    @Override
+    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+        if (!enter || nextAnim == 0) {
+            return super.onCreateAnimation(transit, enter, nextAnim);
+        }
+        final Animation animation = AnimationUtils.loadAnimation(getContext(), nextAnim);
+        animation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {}
+
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                setupList();
+                setupObservers();
+            }
+
+            @Override
+            public void onAnimationRepeat(Animation animation) {}
+        });
+        return animation;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        viewModel.clearReplies();
+    }
+
+    private void setupObservers() {
+        viewModel.getCurrentUserId().observe(getViewLifecycleOwner(), currentUserId -> {
+            long userId = 0;
+            if (currentUserId != null) {
+                userId = currentUserId;
+            }
+            setupAdapter(userId);
+            if (userId == 0) return;
+            Helper.setupCommentInput(binding.commentField, binding.commentText, true, text -> {
+                final LiveData<Resource<Object>> resourceLiveData = viewModel.comment(text, true);
+                resourceLiveData.observe(getViewLifecycleOwner(), new Observer<Resource<Object>>() {
+                    @Override
+                    public void onChanged(final Resource<Object> objectResource) {
+                        if (objectResource == null) return;
+                        final Context context = getContext();
+                        if (context == null) return;
+                        Helper.handleCommentResource(context,
+                                                     objectResource.status,
+                                                     objectResource.message,
+                                                     resourceLiveData,
+                                                     this,
+                                                     binding.commentField,
+                                                     binding.commentText,
+                                                     binding.comments);
+                    }
+                });
+                return null;
+            });
+            final Bundle bundle = getArguments();
+            if (bundle == null) return;
+            final boolean focusInput = bundle.getBoolean(ARG_FOCUS_INPUT);
+            if (focusInput && viewModel.getRepliesParent() != null && viewModel.getRepliesParent().getUser() != null) {
+                binding.commentText.setText(String.format("@%s ", viewModel.getRepliesParent().getUser().getUsername()));
+                Utils.showKeyboard(binding.commentText);
+            }
+        });
+        viewModel.getReplyList().observe(getViewLifecycleOwner(), listResource -> {
+            if (listResource == null) return;
+            switch (listResource.status) {
+                case SUCCESS:
+                    binding.swipeRefreshLayout.setRefreshing(false);
+                    if (commentsAdapter != null) {
+                        commentsAdapter.submitList(listResource.data);
+                    }
+                    break;
+                case ERROR:
+                    binding.swipeRefreshLayout.setRefreshing(false);
+                    if (!TextUtils.isEmpty(listResource.message)) {
+                        Snackbar.make(binding.getRoot(), listResource.message, Snackbar.LENGTH_LONG).show();
+                    }
+                    break;
+                case LOADING:
+                    binding.swipeRefreshLayout.setRefreshing(true);
+                    break;
+            }
+        });
+    }
+
+    private void setupToolbar() {
+        binding.toolbar.setTitle("Replies");
+        binding.toolbar.setNavigationIcon(R.drawable.ic_round_arrow_back_24);
+        binding.toolbar.setNavigationOnClickListener(v -> {
+            final FragmentManager fragmentManager = getParentFragmentManager();
+            fragmentManager.popBackStack();
+        });
+    }
+
+    private void setupAdapter(final long currentUserId) {
+        final Context context = getContext();
+        if (context == null) return;
+        commentsAdapter = new CommentsAdapter(currentUserId,
+                                              true,
+                                              Helper.getCommentCallback(context, getViewLifecycleOwner(), getNavController(), viewModel, null));
+        binding.comments.setAdapter(commentsAdapter);
+        final Resource<List<Comment>> listResource = viewModel.getReplyList().getValue();
+        commentsAdapter.submitList(listResource != null ? listResource.data : Collections.emptyList());
+    }
+
+    private void setupList() {
+        final Context context = getContext();
+        if (context == null) return;
+        final LinearLayoutManager layoutManager = new LinearLayoutManager(context);
+        final RecyclerLazyLoader lazyLoader = new RecyclerLazyLoader(layoutManager, (page, totalItemsCount) -> viewModel.fetchReplies());
+        Helper.setupList(context, binding.comments, layoutManager, lazyLoader);
+    }
+
+    @Nullable
+    private NavController getNavController() {
+        NavController navController = null;
+        try {
+            navController = NavHostFragment.findNavController(this);
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "navigateToProfile", e);
+        }
+        return navController;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageInboxFragment.java b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageInboxFragment.java
index bf13abb6..8c693374 100644
--- a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageInboxFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageInboxFragment.java
@@ -139,7 +139,11 @@ public class DirectMessageInboxFragment extends Fragment implements SwipeRefresh
     public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
         if (item.getItemId() == R.id.pending_requests) {
             final NavDirections directions = DirectMessageInboxFragmentDirections.actionInboxToPendingInbox();
-            NavHostFragment.findNavController(this).navigate(directions);
+            try {
+                NavHostFragment.findNavController(this).navigate(directions);
+            } catch (Exception e) {
+                Log.e(TAG, "onOptionsItemSelected: ", e);
+            }
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -251,7 +255,11 @@ public class DirectMessageInboxFragment extends Fragment implements SwipeRefresh
             if (isAdded()) {
                 final DirectMessageInboxFragmentDirections.ActionInboxToThread directions = DirectMessageInboxFragmentDirections
                         .actionInboxToThread(thread.getThreadId(), thread.getThreadTitle());
-                NavHostFragment.findNavController(this).navigate(directions);
+                try {
+                    NavHostFragment.findNavController(this).navigate(directions);
+                } catch (Exception e) {
+                    Log.e(TAG, "init: ", e);
+                }
             }
             navigating = false;
         });
diff --git a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java
index f98e4094..ea895eba 100644
--- a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageSettingsFragment.java
@@ -354,8 +354,7 @@ public class DirectMessageSettingsFragment extends Fragment implements ConfirmDi
                     }
                     if (TextUtils.isEmpty(user.getUsername())) return;
                     final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections
-                            .actionGlobalProfileFragment()
-                            .setUsername("@" + user.getUsername());
+                            .actionGlobalProfileFragment("@" + user.getUsername());
                     NavHostFragment.findNavController(this).navigate(directions);
                 },
                 (position, user) -> {
@@ -393,8 +392,7 @@ public class DirectMessageSettingsFragment extends Fragment implements ConfirmDi
                 @Override
                 public void onClick(final int position, final PendingUser pendingUser) {
                     final ProfileNavGraphDirections.ActionGlobalProfileFragment directions = ProfileNavGraphDirections
-                            .actionGlobalProfileFragment()
-                            .setUsername("@" + pendingUser.getUser().getUsername());
+                            .actionGlobalProfileFragment("@" + pendingUser.getUser().getUsername());
                     NavHostFragment.findNavController(DirectMessageSettingsFragment.this).navigate(directions);
                 }
 
diff --git a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
index a6b1cb4c..1d6b8f6e 100644
--- a/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/directmessages/DirectMessageThreadFragment.java
@@ -15,7 +15,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.text.Editable;
 import android.util.Log;
-import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -33,7 +32,6 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -75,6 +73,8 @@ import awais.instagrabber.animations.CubicBezierInterpolator;
 import awais.instagrabber.customviews.RecordView;
 import awais.instagrabber.customviews.Tooltip;
 import awais.instagrabber.customviews.emoji.Emoji;
+import awais.instagrabber.customviews.emoji.EmojiBottomSheetDialog;
+import awais.instagrabber.customviews.emoji.EmojiPicker;
 import awais.instagrabber.customviews.helpers.HeaderItemDecoration;
 import awais.instagrabber.customviews.helpers.HeightProvider;
 import awais.instagrabber.customviews.helpers.RecyclerLazyLoaderAtEdge;
@@ -114,7 +114,8 @@ import awais.instagrabber.viewmodels.factories.DirectThreadViewModelFactory;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
 
-public class DirectMessageThreadFragment extends Fragment implements DirectReactionsAdapter.OnReactionClickListener {
+public class DirectMessageThreadFragment extends Fragment implements DirectReactionsAdapter.OnReactionClickListener,
+        EmojiPicker.OnEmojiClickListener {
     private static final String TAG = DirectMessageThreadFragment.class.getSimpleName();
     private static final int STORAGE_PERM_REQUEST_CODE = 8020;
     private static final int AUDIO_RECORD_PERM_REQUEST_CODE = 1000;
@@ -159,6 +160,9 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
     private LiveData<Integer> pendingRequestsCountLiveData;
     private LiveData<List<User>> usersLiveData;
     private boolean autoMarkAsSeen = false;
+    private MenuItem markAsSeenMenuItem;
+    private Media tempMedia;
+    private DirectItem addReactionItem;
 
     private final AppExecutors appExecutors = AppExecutors.getInstance();
     private final Animatable2Compat.AnimationCallback micToSendAnimationCallback = new Animatable2Compat.AnimationCallback() {
@@ -224,8 +228,14 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
                 }
                 return;
             }
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment.builder(media);
-            builder.build().show(getChildFragmentManager(), "post_view");
+            final NavController navController = NavHostFragment.findNavController(DirectMessageThreadFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, media);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
+            }
         }
 
         @Override
@@ -285,6 +295,14 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
                 cb.apply(item);
             }
         }
+
+        @Override
+        public void onAddReactionListener(final DirectItem item) {
+            if (item == null) return;
+            addReactionItem = item;
+            final EmojiBottomSheetDialog emojiBottomSheetDialog = EmojiBottomSheetDialog.newInstance();
+            emojiBottomSheetDialog.show(getChildFragmentManager(), EmojiBottomSheetDialog.TAG);
+        }
     };
 
     private final DirectItemLongClickListener directItemLongClickListener = position -> {
@@ -315,8 +333,6 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
         backStackSavedStateResultLiveData.postValue(null);
     };
     private final MutableLiveData<Integer> inputLength = new MutableLiveData<>(0);
-    private MenuItem markAsSeenMenuItem;
-    private Media tempMedia;
 
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
@@ -327,11 +343,13 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
         final Bundle arguments = getArguments();
         if (arguments == null) return;
         final DirectMessageThreadFragmentArgs fragmentArgs = DirectMessageThreadFragmentArgs.fromBundle(arguments);
+        final User currentUser = appStateViewModel.getCurrentUser();
+        if (currentUser == null) return;
         final DirectThreadViewModelFactory viewModelFactory = new DirectThreadViewModelFactory(
                 fragmentActivity.getApplication(),
                 fragmentArgs.getThreadId(),
                 fragmentArgs.getPending(),
-                appStateViewModel.getCurrentUser()
+                currentUser
         );
         viewModel = new ViewModelProvider(this, viewModelFactory).get(DirectThreadViewModel.class);
         setHasOptionsMenu(true);
@@ -386,7 +404,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
             final DirectMessageThreadFragmentDirections.ActionThreadToSettings directions = DirectMessageThreadFragmentDirections
                     .actionThreadToSettings(viewModel.getThreadId(), null);
             final Boolean pending = viewModel.isPending().getValue();
-            directions.setPending(pending == null ? false : pending);
+            directions.setPending(pending != null && pending);
             NavHostFragment.findNavController(this).navigate(directions);
             return true;
         }
@@ -510,7 +528,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
         super.onDestroy();
     }
 
-    @SuppressLint("UnsafeExperimentalUsageError")
+    @SuppressLint("UnsafeOptInUsageError")
     private void cleanup() {
         if (prevTitleRunnable != null) {
             appExecutors.mainThread().cancel(prevTitleRunnable);
@@ -836,7 +854,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
         }
     }
 
-    @SuppressLint("UnsafeExperimentalUsageError")
+    @SuppressLint("UnsafeOptInUsageError")
     private void attachPendingRequestsBadge(@Nullable final Integer count) {
         if (pendingRequestCountBadgeDrawable == null) {
             final Context context = getContext();
@@ -956,7 +974,9 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
             }
             final DirectThread thread = threadLiveData.getValue();
             if (thread == null) return;
-            markAsSeenMenuItem.setEnabled(!DMUtils.isRead(thread));
+            if (markAsSeenMenuItem != null) {
+                markAsSeenMenuItem.setEnabled(!DMUtils.isRead(thread));
+            }
         });
         if (itemsAdapter == null) return;
         itemsAdapter.submitList(items, () -> {
@@ -1346,7 +1366,7 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
         requestPermissions(DownloadUtils.PERMS, STORAGE_PERM_REQUEST_CODE);
     }
 
-    @NonNull
+    @Nullable
     private User getUser(final long userId) {
         for (final User user : users) {
             if (userId != user.getPk()) continue;
@@ -1447,30 +1467,16 @@ public class DirectMessageThreadFragment extends Fragment implements DirectReact
 
     private void navigateToUser(@NonNull final String username) {
         final ProfileNavGraphDirections.ActionGlobalProfileFragment direction = ProfileNavGraphDirections
-                .actionGlobalProfileFragment()
-                .setUsername("@" + username);
+                .actionGlobalProfileFragment("@" + username);
         NavHostFragment.findNavController(DirectMessageThreadFragment.this).navigate(direction);
     }
 
-    public static class ItemsAdapterDataMerger extends MediatorLiveData<Pair<User, DirectThread>> {
-        private User user;
-        private DirectThread thread;
-
-        public ItemsAdapterDataMerger(final LiveData<User> userLiveData,
-                                      final LiveData<DirectThread> threadLiveData) {
-            addSource(userLiveData, user -> {
-                this.user = user;
-                combine();
-            });
-            addSource(threadLiveData, thread -> {
-                this.thread = thread;
-                combine();
-            });
-        }
-
-        private void combine() {
-            if (user == null || thread == null) return;
-            setValue(new Pair<>(user, thread));
+    @Override
+    public void onClick(final View view, final Emoji emoji) {
+        if (addReactionItem == null) return;
+        final LiveData<Resource<Object>> resourceLiveData = viewModel.sendReaction(addReactionItem, emoji);
+        if (resourceLiveData != null) {
+            resourceLiveData.observe(getViewLifecycleOwner(), directItemResource -> handleSentMessage(resourceLiveData));
         }
     }
 }
diff --git a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java
index f4b8d47e..ea54ceca 100644
--- a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java
@@ -18,7 +18,8 @@ import androidx.activity.OnBackPressedCallback;
 import androidx.activity.OnBackPressedDispatcher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.constraintlayout.motion.widget.MotionLayout;
+import androidx.constraintlayout.motion.widget.MotionScene;
 import androidx.core.content.PermissionChecker;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
@@ -29,7 +30,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import com.google.android.material.appbar.CollapsingToolbarLayout;
 import com.google.common.collect.ImmutableList;
 
 import java.util.List;
@@ -64,7 +64,7 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
     private static final int STORAGE_PERM_REQUEST_CODE_FOR_SELECTION = 8030;
 
     private MainActivity fragmentActivity;
-    private CoordinatorLayout root;
+    private MotionLayout root;
     private FragmentFeedBinding binding;
     private StoriesService storiesService;
     private boolean shouldRefresh = true;
@@ -83,9 +83,12 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
             new FeedStoriesAdapter.OnFeedStoryClickListener() {
                 @Override
                 public void onFeedStoryClick(FeedStoryModel model, int position) {
-                    final NavDirections action = FeedFragmentDirections
-                            .actionFeedFragmentToStoryViewerFragment(StoryViewerOptions.forFeedStoryPosition(position));
-                    NavHostFragment.findNavController(FeedFragment.this).navigate(action);
+                    final NavController navController = NavHostFragment.findNavController(FeedFragment.this);
+                    if (isSafeToNavigate(navController)) {
+                        final NavDirections action = FeedFragmentDirections
+                                .actionFeedFragmentToStoryViewerFragment(StoryViewerOptions.forFeedStoryPosition(position));
+                        navController.navigate(action);
+                    }
                 }
 
                 @Override
@@ -108,12 +111,16 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
 
         @Override
         public void onCommentsClick(final Media feedModel) {
-            final NavDirections commentsAction = FeedFragmentDirections.actionGlobalCommentsViewerFragment(
-                    feedModel.getCode(),
-                    feedModel.getPk(),
-                    feedModel.getUser().getPk()
-            );
-            NavHostFragment.findNavController(FeedFragment.this).navigate(commentsAction);
+            try {
+                final NavDirections commentsAction = FeedFragmentDirections.actionGlobalCommentsViewerFragment(
+                        feedModel.getCode(),
+                        feedModel.getPk(),
+                        feedModel.getUser().getPk()
+                );
+                NavHostFragment.findNavController(FeedFragment.this).navigate(commentsAction);
+            } catch (Exception e) {
+                Log.e(TAG, "onCommentsClick: ", e);
+            }
         }
 
         @Override
@@ -148,11 +155,13 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
 
         @Override
         public void onNameClick(final Media feedModel, final View profilePicView) {
+            if (feedModel.getUser() == null) return;
             navigateToProfile("@" + feedModel.getUser().getUsername());
         }
 
         @Override
         public void onProfilePicClick(final Media feedModel, final View profilePicView) {
+            if (feedModel.getUser() == null) return;
             navigateToProfile("@" + feedModel.getUser().getUsername());
         }
 
@@ -170,15 +179,21 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
                                     final View profilePicView,
                                     final View mainPostImage,
                                     final int position) {
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment.builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            // ViewCompat.setTransitionName(profilePicView, "profile_pic");
+            // ViewCompat.setTransitionName(mainPostImage, "post_image");
+            // final FragmentNavigator.Extras extras = new FragmentNavigator.Extras.Builder()
+            //         .addSharedElement(profilePicView, "profile_pic")
+            //         .addSharedElement(mainPostImage, "post_image")
+            //         .build();
+            final NavController navController = NavHostFragment.findNavController(FeedFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            builder.build().show(getChildFragmentManager(), "post_view");
         }
     };
     private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(false) {
@@ -269,9 +284,6 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
                              final Bundle savedInstanceState) {
         if (root != null) {
             shouldRefresh = false;
-            if (storiesRecyclerView != null) {
-                fragmentActivity.setCollapsingView(storiesRecyclerView);
-            }
             return root;
         }
         binding = FragmentFeedBinding.inflate(inflater, container, false);
@@ -372,6 +384,17 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
                                 .setSelectionModeCallback(selectionModeCallback)
                                 .init();
         binding.feedSwipeRefreshLayout.setRefreshing(true);
+        binding.feedRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                final boolean canScrollVertically = recyclerView.canScrollVertically(-1);
+                final MotionScene.Transition transition = root.getTransition(R.id.transition);
+                if (transition != null) {
+                    transition.setEnable(!canScrollVertically);
+                }
+            }
+        });
         // if (shouldAutoPlay) {
         //     videoAwareRecyclerScroller = new VideoAwareRecyclerScroller();
         //     binding.feedRecyclerView.addOnScrollListener(videoAwareRecyclerScroller);
@@ -387,15 +410,9 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
         feedStoriesViewModel = new ViewModelProvider(fragmentActivity).get(FeedStoriesViewModel.class);
         final Context context = getContext();
         if (context == null) return;
-        storiesRecyclerView = new RecyclerView(context);
-        final CollapsingToolbarLayout.LayoutParams params = new CollapsingToolbarLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                                                     ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, Utils.getActionBarHeight(context), 0, 0);
-        storiesRecyclerView.setLayoutParams(params);
-        storiesRecyclerView.setClipToPadding(false);
+        storiesRecyclerView = binding.header;
         storiesRecyclerView.setLayoutManager(new LinearLayoutManager(context, RecyclerView.HORIZONTAL, false));
         storiesRecyclerView.setAdapter(feedStoriesAdapter);
-        fragmentActivity.setCollapsingView(storiesRecyclerView);
         feedStoriesViewModel.getList().observe(getViewLifecycleOwner(), feedStoriesAdapter::submitList);
         fetchStories();
     }
@@ -437,4 +454,9 @@ public class FeedFragment extends Fragment implements SwipeRefreshLayout.OnRefre
         binding.feedRecyclerView.smoothScrollToPosition(0);
         // binding.storiesContainer.setExpanded(true);
     }
+
+    private boolean isSafeToNavigate(final NavController navController) {
+        return navController.getCurrentDestination() != null
+                && navController.getCurrentDestination().getId() == R.id.feedFragment;
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
index cc2ce13a..17dfa964 100644
--- a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
@@ -27,7 +27,8 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.constraintlayout.motion.widget.MotionLayout;
+import androidx.constraintlayout.motion.widget.MotionScene;
 import androidx.core.content.PermissionChecker;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -108,7 +109,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
     private static final int STORAGE_PERM_REQUEST_CODE_FOR_SELECTION = 8030;
 
     private MainActivity fragmentActivity;
-    private CoordinatorLayout root;
+    private MotionLayout root;
     private FragmentProfileBinding binding;
     private boolean isLoggedIn;
     private String cookie;
@@ -188,7 +189,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
 
         @Override
         public void onCommentsClick(final Media feedModel) {
-            final NavDirections commentsAction = FeedFragmentDirections.actionGlobalCommentsViewerFragment(
+            final NavDirections commentsAction = ProfileFragmentDirections.actionGlobalCommentsViewerFragment(
                     feedModel.getCode(),
                     feedModel.getPk(),
                     feedModel.getUser().getPk()
@@ -250,21 +251,15 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
                                     final View profilePicView,
                                     final View mainPostImage,
                                     final int position) {
-            final PostViewV2Fragment.Builder builder = PostViewV2Fragment
-                    .builder(feedModel);
-            if (position >= 0) {
-                builder.setPosition(position);
+            final NavController navController = NavHostFragment.findNavController(ProfileFragment.this);
+            final Bundle bundle = new Bundle();
+            bundle.putSerializable(PostViewV2Fragment.ARG_MEDIA, feedModel);
+            bundle.putInt(PostViewV2Fragment.ARG_SLIDER_POSITION, position);
+            try {
+                navController.navigate(R.id.action_global_post_view, bundle);
+            } catch (Exception e) {
+                Log.e(TAG, "openPostDialog: ", e);
             }
-            if (!layoutPreferences.isAnimationDisabled()) {
-                builder.setSharedProfilePicElement(profilePicView)
-                       .setSharedMainPostElement(mainPostImage);
-            }
-            final PostViewV2Fragment postViewV2Fragment = builder.build();
-            postViewV2Fragment.setOnDeleteListener(() -> {
-                postViewV2Fragment.dismiss();
-                binding.postsRecyclerView.refresh();
-            });
-            postViewV2Fragment.show(getChildFragmentManager(), "post_view");
         }
     };
     private final FeedAdapterV2.SelectionModeCallback selectionModeCallback = new FeedAdapterV2.SelectionModeCallback() {
@@ -343,26 +338,22 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
                     final boolean isSame = ("@" + profileModelUsername).equals(this.username);
                     if (isSame) {
                         setUsernameDelayed();
-                        fragmentActivity.setCollapsingView(profileDetailsBinding.getRoot());
                         shouldRefresh = false;
                         return root;
                     }
                 }
                 if (username == null || !username.equals(this.username)) {
-                    fragmentActivity.setCollapsingView(profileDetailsBinding.getRoot());
                     shouldRefresh = true;
                     return root;
                 }
             }
             setUsernameDelayed();
-            fragmentActivity.setCollapsingView(profileDetailsBinding.getRoot());
             shouldRefresh = false;
             return root;
         }
         binding = FragmentProfileBinding.inflate(inflater, container, false);
         root = binding.getRoot();
-        profileDetailsBinding = LayoutProfileDetailsBinding.inflate(inflater, fragmentActivity.getCollapsingToolbarView(), false);
-        fragmentActivity.setCollapsingView(profileDetailsBinding.getRoot());
+        profileDetailsBinding = binding.header;
         return root;
     }
 
@@ -552,14 +543,6 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        if (profileDetailsBinding != null) {
-            fragmentActivity.removeCollapsingView(profileDetailsBinding.getRoot());
-        }
-    }
-
     @Override
     public void onRequestPermissionsResult(final int requestCode, @NonNull final String[] permissions, @NonNull final int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -587,7 +570,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
             setUsernameDelayed();
         }
         if (TextUtils.isEmpty(username) && !isLoggedIn) {
-            profileDetailsBinding.infoContainer.setVisibility(View.GONE);
+            binding.header.getRoot().setVisibility(View.GONE);
             binding.swipeRefreshLayout.setEnabled(false);
             binding.privatePage1.setImageResource(R.drawable.ic_outline_info_24);
             binding.privatePage2.setText(R.string.no_acc);
@@ -691,7 +674,6 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
             fetchStoryAndHighlights(profileId);
         }
         setupButtons(profileId);
-        profileDetailsBinding.favChip.setVisibility(View.VISIBLE);
         final FavoriteRepository favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(getContext()));
         favoriteRepository.getFavorite(profileModel.getUsername(), FavoriteType.USER, new RepositoryCallback<Favorite>() {
             @Override
@@ -936,6 +918,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
                 profileDetailsBinding.btnSaved.setVisibility(View.VISIBLE);
                 profileDetailsBinding.btnLiked.setVisibility(View.VISIBLE);
                 profileDetailsBinding.btnDM.setVisibility(View.GONE);
+                profileDetailsBinding.favChip.setVisibility(View.GONE);
                 profileDetailsBinding.btnSaved.setText(R.string.saved);
                 if (!accountIsUpdated) updateAccountInfo();
                 return;
@@ -944,6 +927,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
             profileDetailsBinding.btnLiked.setVisibility(View.GONE);
             profileDetailsBinding.btnDM.setVisibility(disableDm ? View.GONE : View.VISIBLE);
             profileDetailsBinding.btnFollow.setVisibility(View.VISIBLE);
+            profileDetailsBinding.favChip.setVisibility(View.VISIBLE);
             final Context context = getContext();
             if (context == null) return;
             if (profileModel.getFriendshipStatus().isFollowing() || profileModel.getFriendshipStatus().isFollowedBy()) {
@@ -988,7 +972,6 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
             if (chainingMenuItem != null) {
                 chainingMenuItem.setVisible(true);
             }
-            return;
         }
     }
 
@@ -1207,6 +1190,17 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
                                  .setFeedItemCallback(feedItemCallback)
                                  .setSelectionModeCallback(selectionModeCallback)
                                  .init();
+        binding.postsRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull final RecyclerView recyclerView, final int dx, final int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                final boolean canScrollVertically = recyclerView.canScrollVertically(-1);
+                final MotionScene.Transition transition = root.getTransition(R.id.transition);
+                if (transition != null) {
+                    transition.setEnable(!canScrollVertically);
+                }
+            }
+        });
         binding.swipeRefreshLayout.setRefreshing(true);
         postsSetupDone = true;
     }
diff --git a/app/src/main/java/awais/instagrabber/fragments/search/SearchCategoryFragment.java b/app/src/main/java/awais/instagrabber/fragments/search/SearchCategoryFragment.java
new file mode 100644
index 00000000..4eb1ed8d
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/fragments/search/SearchCategoryFragment.java
@@ -0,0 +1,197 @@
+package awais.instagrabber.fragments.search;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import awais.instagrabber.adapters.SearchItemsAdapter;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+import awais.instagrabber.viewmodels.SearchFragmentViewModel;
+
+public class SearchCategoryFragment extends Fragment {
+    private static final String TAG = SearchCategoryFragment.class.getSimpleName();
+    private static final String ARG_TYPE = "type";
+
+
+    @Nullable
+    private SwipeRefreshLayout swipeRefreshLayout;
+    @Nullable
+    private RecyclerView list;
+    private SearchFragmentViewModel viewModel;
+    private FavoriteType type;
+    private SearchItemsAdapter searchItemsAdapter;
+    @Nullable
+    private OnSearchItemClickListener onSearchItemClickListener;
+    private boolean skipViewRefresh;
+    private String prevQuery;
+
+    @NonNull
+    public static SearchCategoryFragment newInstance(@NonNull final FavoriteType type) {
+        final SearchCategoryFragment fragment = new SearchCategoryFragment();
+        final Bundle args = new Bundle();
+        args.putSerializable(ARG_TYPE, type);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public SearchCategoryFragment() {}
+
+    @Override
+    public void onAttach(@NonNull final Context context) {
+        super.onAttach(context);
+        final Fragment parentFragment = getParentFragment();
+        if (!(parentFragment instanceof OnSearchItemClickListener)) return;
+        onSearchItemClickListener = (OnSearchItemClickListener) parentFragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final FragmentActivity fragmentActivity = getActivity();
+        if (fragmentActivity == null) return;
+        viewModel = new ViewModelProvider(fragmentActivity).get(SearchFragmentViewModel.class);
+        final Bundle args = getArguments();
+        if (args == null) {
+            Log.e(TAG, "onCreate: arguments are null");
+            return;
+        }
+        final Serializable typeSerializable = args.getSerializable(ARG_TYPE);
+        if (!(typeSerializable instanceof FavoriteType)) {
+            Log.e(TAG, "onCreate: type not a FavoriteType");
+            return;
+        }
+        type = (FavoriteType) typeSerializable;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
+        final Context context = getContext();
+        if (context == null) return null;
+        skipViewRefresh = false;
+        if (swipeRefreshLayout != null) {
+            skipViewRefresh = true;
+            return swipeRefreshLayout;
+        }
+        swipeRefreshLayout = new SwipeRefreshLayout(context);
+        swipeRefreshLayout.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        list = new RecyclerView(context);
+        list.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        swipeRefreshLayout.addView(list);
+        return swipeRefreshLayout;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        if (skipViewRefresh) return;
+        setupList();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        // Log.d(TAG, "onResume: type: " + type);
+        setupObservers();
+        final String currentQuery = viewModel.getQuery().getValue();
+        if (prevQuery != null && currentQuery != null && !Objects.equals(prevQuery, currentQuery)) {
+            viewModel.search(currentQuery, type);
+        }
+        prevQuery = null;
+    }
+
+    private void setupList() {
+        if (list == null || swipeRefreshLayout == null) return;
+        final Context context = getContext();
+        if (context == null) return;
+        list.setLayoutManager(new LinearLayoutManager(context));
+        searchItemsAdapter = new SearchItemsAdapter(onSearchItemClickListener);
+        list.setAdapter(searchItemsAdapter);
+        swipeRefreshLayout.setOnRefreshListener(() -> {
+            String currentQuery = viewModel.getQuery().getValue();
+            if (currentQuery == null) currentQuery = "";
+            viewModel.search(currentQuery, type);
+        });
+    }
+
+    private void setupObservers() {
+        viewModel.getQuery().observe(getViewLifecycleOwner(), q -> {
+            if (!isVisible() || Objects.equals(prevQuery, q)) return;
+            viewModel.search(q, type);
+            prevQuery = q;
+        });
+        final LiveData<Resource<List<SearchItem>>> resultsLiveData = getResultsLiveData();
+        if (resultsLiveData != null) {
+            resultsLiveData.observe(getViewLifecycleOwner(), this::onResults);
+        }
+    }
+
+    private void onResults(final Resource<List<SearchItem>> listResource) {
+        if (listResource == null) return;
+        switch (listResource.status) {
+            case SUCCESS:
+                if (searchItemsAdapter != null) {
+                    searchItemsAdapter.submitList(listResource.data);
+                }
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setRefreshing(false);
+                }
+                break;
+            case ERROR:
+                if (searchItemsAdapter != null) {
+                    searchItemsAdapter.submitList(Collections.emptyList());
+                }
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setRefreshing(false);
+                }
+                break;
+            case LOADING:
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setRefreshing(true);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Nullable
+    private LiveData<Resource<List<SearchItem>>> getResultsLiveData() {
+        switch (type) {
+            case TOP:
+                return viewModel.getTopResults();
+            case USER:
+                return viewModel.getUserResults();
+            case HASHTAG:
+                return viewModel.getHashtagResults();
+            case LOCATION:
+                return viewModel.getLocationResults();
+        }
+        return null;
+    }
+
+    public interface OnSearchItemClickListener {
+        void onSearchItemClick(SearchItem searchItem);
+
+        void onSearchItemDelete(SearchItem searchItem);
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/fragments/search/SearchFragment.java b/app/src/main/java/awais/instagrabber/fragments/search/SearchFragment.java
new file mode 100644
index 00000000..8e31cb70
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/fragments/search/SearchFragment.java
@@ -0,0 +1,244 @@
+package awais.instagrabber.fragments.search;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.tabs.TabLayoutMediator;
+
+import java.util.Arrays;
+import java.util.List;
+
+import awais.instagrabber.R;
+import awais.instagrabber.activities.MainActivity;
+import awais.instagrabber.adapters.SearchCategoryAdapter;
+import awais.instagrabber.customviews.helpers.TextWatcherAdapter;
+import awais.instagrabber.databinding.FragmentSearchBinding;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+import awais.instagrabber.viewmodels.SearchFragmentViewModel;
+
+public class SearchFragment extends Fragment implements SearchCategoryFragment.OnSearchItemClickListener {
+    private static final String TAG = SearchFragment.class.getSimpleName();
+    private static final String QUERY = "query";
+
+    private FragmentSearchBinding binding;
+    private LinearLayoutCompat root;
+    private boolean shouldRefresh = true;
+    @Nullable
+    private EditText searchInput;
+    @Nullable
+    private MainActivity mainActivity;
+    private SearchFragmentViewModel viewModel;
+
+    private final TextWatcherAdapter textWatcher = new TextWatcherAdapter() {
+        @Override
+        public void afterTextChanged(final Editable s) {
+            if (s == null) return;
+            viewModel.submitQuery(s.toString().trim());
+        }
+    };
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final FragmentActivity fragmentActivity = getActivity();
+        if (!(fragmentActivity instanceof MainActivity)) return;
+        mainActivity = (MainActivity) fragmentActivity;
+        viewModel = new ViewModelProvider(mainActivity).get(SearchFragmentViewModel.class);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable final Bundle savedInstanceState) {
+        if (root != null) {
+            shouldRefresh = false;
+            return root;
+        }
+        binding = FragmentSearchBinding.inflate(inflater, container, false);
+        root = binding.getRoot();
+        return root;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
+        if (!shouldRefresh) return;
+        init(savedInstanceState);
+        shouldRefresh = false;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull final Bundle outState) {
+        super.onSaveInstanceState(outState);
+        final String current = viewModel.getQuery().getValue();
+        if (TextUtils.isEmpty(current)) return;
+        outState.putString(QUERY, current);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mainActivity != null) {
+            mainActivity.hideSearchView();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mainActivity != null) {
+            mainActivity.hideSearchView();
+        }
+        if (searchInput != null) {
+            searchInput.removeTextChangedListener(textWatcher);
+            searchInput.setText("");
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mainActivity != null) {
+            mainActivity.showSearchView();
+        }
+        // if (searchInputLayout != null) {
+        //     searchInputLayout.requestFocus();
+        // }
+    }
+
+    private void init(@Nullable final Bundle savedInstanceState) {
+        if (mainActivity == null) return;
+        searchInput = mainActivity.showSearchView().getEditText();
+        setupObservers();
+        setupViewPager();
+        setupSearchInput(savedInstanceState);
+    }
+
+    private void setupObservers() {
+        viewModel.getQuery().observe(getViewLifecycleOwner(), q -> {}); // need to observe, so that getQuery returns proper value
+    }
+
+    private void setupSearchInput(@Nullable final Bundle savedInstanceState) {
+        if (searchInput == null) return;
+        searchInput.removeTextChangedListener(textWatcher); // make sure we add only 1 instance of textWatcher
+        searchInput.addTextChangedListener(textWatcher);
+        boolean triggerEmptyQuery = true;
+        if (savedInstanceState != null) {
+            final String savedQuery = savedInstanceState.getString(QUERY);
+            if (TextUtils.isEmpty(savedQuery)) return;
+            searchInput.setText(savedQuery);
+            triggerEmptyQuery = false;
+        }
+        // searchInput.requestFocus();
+        if (triggerEmptyQuery) {
+            viewModel.submitQuery("");
+        }
+    }
+
+    private void setupViewPager() {
+        binding.pager.setSaveEnabled(false);
+        final List<FavoriteType> categories = Arrays.asList(FavoriteType.values());
+        binding.pager.setAdapter(new SearchCategoryAdapter(this, categories));
+        final TabLayoutMediator mediator = new TabLayoutMediator(binding.tabLayout, binding.pager, (tab, position) -> {
+            try {
+                final FavoriteType type = categories.get(position);
+                final int resId;
+                switch (type) {
+                    case TOP:
+                        resId = R.string.top;
+                        break;
+                    case USER:
+                        resId = R.string.accounts;
+                        break;
+                    case HASHTAG:
+                        resId = R.string.hashtags;
+                        break;
+                    case LOCATION:
+                        resId = R.string.locations;
+                        break;
+                    default:
+                        throw new IllegalStateException("Unexpected value: " + type);
+                }
+                tab.setText(resId);
+            } catch (Exception e) {
+                Log.e(TAG, "setupViewPager: ", e);
+            }
+        });
+        mediator.attach();
+    }
+
+    @Override
+    public void onSearchItemClick(final SearchItem searchItem) {
+        if (searchItem == null) return;
+        final FavoriteType type = searchItem.getType();
+        if (type == null) return;
+        try {
+            if (!searchItem.isFavorite()) {
+                viewModel.saveToRecentSearches(searchItem); // insert or update recent
+            }
+            final NavController navController = NavHostFragment.findNavController(this);
+            final Bundle bundle = new Bundle();
+            switch (type) {
+                case USER:
+                    bundle.putString("username", searchItem.getUser().getUsername());
+                    navController.navigate(R.id.action_global_profileFragment, bundle);
+                    break;
+                case HASHTAG:
+                    bundle.putString("hashtag", searchItem.getHashtag().getName());
+                    navController.navigate(R.id.action_global_hashTagFragment, bundle);
+                    break;
+                case LOCATION:
+                    bundle.putLong("locationId", searchItem.getPlace().getLocation().getPk());
+                    navController.navigate(R.id.action_global_locationFragment, bundle);
+                    break;
+                default:
+                    break;
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "onSearchItemClick: ", e);
+        }
+    }
+
+    @Override
+    public void onSearchItemDelete(final SearchItem searchItem) {
+        final LiveData<Resource<Object>> liveData = viewModel.deleteRecentSearch(searchItem);
+        if (liveData == null) return;
+        liveData.observe(getViewLifecycleOwner(), new Observer<Resource<Object>>() {
+            @Override
+            public void onChanged(final Resource<Object> resource) {
+                if (resource == null) return;
+                switch (resource.status) {
+                    case SUCCESS:
+                        viewModel.search("", FavoriteType.TOP);
+                        liveData.removeObserver(this);
+                        break;
+                    case ERROR:
+                        Snackbar.make(binding.getRoot(), R.string.error, Snackbar.LENGTH_SHORT).show();
+                        liveData.removeObserver(this);
+                        break;
+                    case LOADING:
+                    default:
+                        break;
+                }
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java
index 98afce8d..5a48c04b 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/AboutFragment.java
@@ -75,6 +75,12 @@ public class AboutFragment extends BasePreferencesFragment {
                 "Copyright (C) 2014 Austin Andrews & Google LLC. Apache 2.0.",
                 "https://materialdesignicons.com"
         ));
+        thirdPartyCategory.addPreference(get3ptPreference(
+                context,
+                "Process Phoenix",
+                "Copyright (C) 2015 Jake Wharton. Apache 2.0.",
+                "https://github.com/JakeWharton/ProcessPhoenix"
+        ));
         thirdPartyCategory.addPreference(get3ptPreference(
                 context,
                 "Retrofit",
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
index c2637b78..4e75a97f 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
@@ -29,6 +29,7 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
         if (context == null) return;
         screen.addPreference(getDownloadUserFolderPreference(context));
         screen.addPreference(getSaveToCustomFolderPreference(context));
+        screen.addPreference(getPrependUsernameToFilenamePreference(context));
     }
 
     private Preference getDownloadUserFolderPreference(@NonNull final Context context) {
@@ -49,6 +50,14 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
                 .show(getParentFragmentManager(), null));
     }
 
+    private Preference getPrependUsernameToFilenamePreference(@NonNull final Context context) {
+        final SwitchPreferenceCompat preference = new SwitchPreferenceCompat(context);
+        preference.setKey(Constants.DOWNLOAD_PREPEND_USER_NAME);
+        preference.setTitle(R.string.download_prepend_username);
+        preference.setIconSpaceReserved(false);
+        return preference;
+    }
+
     public static class SaveToCustomFolderPreference extends Preference {
         private AppCompatTextView customPathTextView;
         private final OnSelectFolderButtonClickListener onSelectFolderButtonClickListener;
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
index a7d39fc8..a022d9ee 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java
@@ -11,8 +11,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.navigation.NavController;
 import androidx.navigation.NavDirections;
@@ -35,9 +33,11 @@ import awais.instagrabber.db.repositories.AccountRepository;
 import awais.instagrabber.db.repositories.RepositoryCallback;
 import awais.instagrabber.dialogs.AccountSwitcherDialogFragment;
 import awais.instagrabber.repositories.responses.User;
+import awais.instagrabber.utils.AppExecutors;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
 import awais.instagrabber.utils.FlavorTown;
+import awais.instagrabber.utils.ProcessPhoenix;
 import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.utils.Utils;
 import awais.instagrabber.webservices.ServiceCallback;
@@ -60,7 +60,6 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         final MainActivity activity = (MainActivity) getActivity();
         // screen.addPreference(new MoreHeaderPreference(getContext()));
         final Context context = getContext();
-        final Resources resources = context.getResources();
         if (context == null) return;
         accountRepository = AccountRepository.getInstance(AccountDataSource.getInstance(context));
         final PreferenceCategory accountCategory = new PreferenceCategory(context);
@@ -71,11 +70,13 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
             accountCategory.setSummary(R.string.account_hint);
             accountCategory.addPreference(getAccountSwitcherPreference(cookie, context));
             accountCategory.addPreference(getPreference(R.string.logout, R.string.logout_summary, R.drawable.ic_logout_24, preference -> {
-                if (getContext() == null) return false;
+                final Context context1 = getContext();
+                if (context1 == null) return false;
                 CookieUtils.setupCookies("LOGOUT");
-                shouldRecreate();
-                Toast.makeText(context, R.string.logout_success, Toast.LENGTH_SHORT).show();
+                // shouldRecreate();
+                Toast.makeText(context1, R.string.logout_success, Toast.LENGTH_SHORT).show();
                 settingsHelper.putString(Constants.COOKIE, "");
+                AppExecutors.getInstance().mainThread().execute(() -> ProcessPhoenix.triggerRebirth(context1), 200);
                 return true;
             }));
         }
@@ -84,28 +85,44 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
             public void onSuccess(@NonNull final List<Account> accounts) {
                 if (!isLoggedIn) {
                     if (accounts.size() > 0) {
-                        accountCategory.addPreference(getAccountSwitcherPreference(null, context));
+                        final Context context1 = getContext();
+                        final AccountSwitcherPreference preference = getAccountSwitcherPreference(null, context1);
+                        if (preference == null) return;
+                        accountCategory.addPreference(preference);
                     }
                     // Need to show something to trigger login activity
-                    accountCategory.addPreference(getPreference(R.string.add_account, R.drawable.ic_add, preference -> {
-                        startActivityForResult(new Intent(getContext(), Login.class), Constants.LOGIN_RESULT_CODE);
+                    final Preference preference1 = getPreference(R.string.add_account, R.drawable.ic_add, preference -> {
+                        final Context context1 = getContext();
+                        if (context1 == null) return false;
+                        startActivityForResult(new Intent(context1, Login.class), Constants.LOGIN_RESULT_CODE);
                         return true;
-                    }));
+                    });
+                    if (preference1 == null) return;
+                    accountCategory.addPreference(preference1);
                 }
                 if (accounts.size() > 0) {
-                    accountCategory
-                            .addPreference(getPreference(R.string.remove_all_acc, null, R.drawable.ic_account_multiple_remove_24, preference -> {
+                    final Preference preference1 = getPreference(
+                            R.string.remove_all_acc,
+                            null,
+                            R.drawable.ic_account_multiple_remove_24,
+                            preference -> {
                                 if (getContext() == null) return false;
                                 new AlertDialog.Builder(getContext())
                                         .setTitle(R.string.logout)
                                         .setMessage(R.string.remove_all_acc_warning)
                                         .setPositiveButton(R.string.yes, (dialog, which) -> {
-                                            CookieUtils.removeAllAccounts(context, new RepositoryCallback<Void>() {
+                                            final Context context1 = getContext();
+                                            if (context1 == null) return;
+                                            CookieUtils.removeAllAccounts(context1, new RepositoryCallback<Void>() {
                                                 @Override
                                                 public void onSuccess(final Void result) {
-                                                    shouldRecreate();
-                                                    Toast.makeText(context, R.string.logout_success, Toast.LENGTH_SHORT).show();
+                                                    // shouldRecreate();
+                                                    final Context context1 = getContext();
+                                                    if (context1 == null) return;
+                                                    Toast.makeText(context1, R.string.logout_success, Toast.LENGTH_SHORT).show();
                                                     settingsHelper.putString(Constants.COOKIE, "");
+                                                    AppExecutors.getInstance().mainThread()
+                                                                .execute(() -> ProcessPhoenix.triggerRebirth(context1), 200);
                                                 }
 
                                                 @Override
@@ -115,7 +132,9 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
                                         .setNegativeButton(R.string.cancel, null)
                                         .show();
                                 return true;
-                            }));
+                            });
+                    if (preference1 == null) return;
+                    accountCategory.addPreference(preference1);
                 }
             }
 
@@ -223,12 +242,14 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
                                            -1,
                                            preference -> {
                                                if (BuildConfig.isPre) return true;
+                                               if (activity == null) return false;
                                                FlavorTown.updateCheck(activity, true);
                                                return true;
                                            }));
         screen.addPreference(getDivider(context));
 
         final Preference reminderPreference = getPreference(R.string.reminder, R.string.reminder_summary, R.drawable.ic_warning, null);
+        if (reminderPreference == null) return;
         reminderPreference.setSelectable(false);
         screen.addPreference(reminderPreference);
     }
@@ -265,9 +286,14 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
                                 new RepositoryCallback<Account>() {
                                     @Override
                                     public void onSuccess(final Account result) {
-                                        final FragmentActivity activity = getActivity();
-                                        if (activity == null) return;
-                                        activity.recreate();
+                                        // final FragmentActivity activity = getActivity();
+                                        // if (activity == null) return;
+                                        // activity.recreate();
+                                        AppExecutors.getInstance().mainThread().execute(() -> {
+                                            final Context context = getContext();
+                                            if (context == null) return;
+                                            ProcessPhoenix.triggerRebirth(context);
+                                        }, 200);
                                     }
 
                                     @Override
@@ -286,6 +312,7 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         }
     }
 
+    @Nullable
     private AccountSwitcherPreference getAccountSwitcherPreference(final String cookie, final Context context) {
         if (context == null) return null;
         return new AccountSwitcherPreference(context, cookie, accountRepository, v -> showAccountSwitcherDialog());
@@ -300,12 +327,14 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         dialogFragment.show(fragmentManager, "accountSwitcher");
     }
 
+    @Nullable
     private Preference getPreference(final int title,
                                      final int icon,
                                      final Preference.OnPreferenceClickListener clickListener) {
         return getPreference(title, -1, icon, clickListener);
     }
 
+    @Nullable
     private Preference getPreference(final int title,
                                      final int summary,
                                      final int icon,
@@ -321,6 +350,7 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         return getPreference(title, string, icon, clickListener);
     }
 
+    @Nullable
     private Preference getPreference(final int title,
                                      final String summary,
                                      final int icon,
@@ -338,15 +368,14 @@ public class MorePreferencesFragment extends BasePreferencesFragment {
         return preference;
     }
 
-
-    public static class MoreHeaderPreference extends Preference {
-
-        public MoreHeaderPreference(final Context context) {
-            super(context);
-            setLayoutResource(R.layout.pref_more_header);
-            setSelectable(false);
-        }
-    }
+    // public static class MoreHeaderPreference extends Preference {
+    //
+    //     public MoreHeaderPreference(final Context context) {
+    //         super(context);
+    //         setLayoutResource(R.layout.pref_more_header);
+    //         setSelectable(false);
+    //     }
+    // }
 
     public static class AccountSwitcherPreference extends Preference {
 
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java
index 14daec7f..c79d009b 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java
@@ -17,16 +17,26 @@ public class PostPreferencesFragment extends BasePreferencesFragment {
         final Context context = getContext();
         if (context == null) return;
         // generalCategory.addPreference(getAutoPlayVideosPreference(context));
+        screen.addPreference(getBackgroundPlayPreference(context));
         screen.addPreference(getAlwaysMuteVideosPreference(context));
         screen.addPreference(getShowCaptionPreference(context));
         screen.addPreference(getToggleKeywordFilterPreference(context));
         screen.addPreference(getEditKeywordFilterPreference(context));
     }
 
-    private Preference getAutoPlayVideosPreference(@NonNull final Context context) {
+//    private Preference getAutoPlayVideosPreference(@NonNull final Context context) {
+//        final SwitchPreferenceCompat preference = new SwitchPreferenceCompat(context);
+//        preference.setKey(Constants.AUTOPLAY_VIDEOS);
+//        preference.setTitle(R.string.post_viewer_autoplay_video);
+//        preference.setIconSpaceReserved(false);
+//        return preference;
+//    }
+
+    private Preference getBackgroundPlayPreference(@NonNull final Context context) {
         final SwitchPreferenceCompat preference = new SwitchPreferenceCompat(context);
-        preference.setKey(Constants.AUTOPLAY_VIDEOS);
-        preference.setTitle(R.string.post_viewer_autoplay_video);
+        preference.setKey(Constants.PLAY_IN_BACKGROUND);
+        preference.setTitle(R.string.post_viewer_background_play);
+        preference.setSummary(R.string.post_viewer_background_play_summary);
         preference.setIconSpaceReserved(false);
         return preference;
     }
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/PreferenceKeys.java b/app/src/main/java/awais/instagrabber/fragments/settings/PreferenceKeys.java
index 5287a1a5..dacf80f6 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/PreferenceKeys.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/PreferenceKeys.java
@@ -7,4 +7,5 @@ public final class PreferenceKeys {
     public static final String PREF_ENABLE_DM_AUTO_REFRESH_FREQ_NUMBER = "enable_dm_auto_refresh_freq_number";
     public static final String PREF_ENABLE_SENTRY = "enable_sentry";
     public static final String PREF_TAB_ORDER = "tab_order";
+    public static final String PREF_SHOWN_COUNT_TOOLTIP = "shown_count_tooltip";
 }
diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/StoriesPreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/StoriesPreferencesFragment.java
index 99eee7c7..0f3850ab 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/StoriesPreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/StoriesPreferencesFragment.java
@@ -17,6 +17,7 @@ public class StoriesPreferencesFragment extends BasePreferencesFragment {
         final Context context = getContext();
         if (context == null) return;
         screen.addPreference(getStorySortPreference(context));
+        screen.addPreference(getHideMutedReelsPreference(context));
         screen.addPreference(getMarkStoriesSeenPreference(context));
     }
 
diff --git a/app/src/main/java/awais/instagrabber/managers/InboxManager.java b/app/src/main/java/awais/instagrabber/managers/InboxManager.java
index 98e12b46..eb54b8e2 100644
--- a/app/src/main/java/awais/instagrabber/managers/InboxManager.java
+++ b/app/src/main/java/awais/instagrabber/managers/InboxManager.java
@@ -82,8 +82,12 @@ public final class InboxManager {
         final long userId = CookieUtils.getUserIdFromCookie(cookie);
         final String deviceUuid = settingsHelper.getString(Constants.DEVICE_UUID);
         final String csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
-        if (TextUtils.isEmpty(csrfToken) || userId <= 0 || TextUtils.isEmpty(deviceUuid)) {
-            throw new IllegalArgumentException("User is not logged in!");
+        if (TextUtils.isEmpty(csrfToken)) {
+            throw new IllegalArgumentException("csrfToken is empty!");
+        } else if (userId == 0) {
+            throw new IllegalArgumentException("user id invalid");
+        } else if (TextUtils.isEmpty(deviceUuid)) {
+            throw new IllegalArgumentException("device uuid is empty!");
         }
         service = DirectMessagesService.getInstance(csrfToken, userId, deviceUuid);
 
@@ -281,8 +285,13 @@ public final class InboxManager {
             if (index < 0) return;
             final List<DirectThread> threads = inbox.getThreads();
             final DirectThread thread = threads.get(index);
-            thread.setItems(updatedItems);
-            setThread(inbox, index, thread);
+            try {
+                final DirectThread threadClone = (DirectThread) thread.clone();
+                threadClone.setItems(updatedItems);
+                setThread(inbox, index, threadClone);
+            } catch (Exception e) {
+                Log.e(TAG, "setItemsToThread: ", e);
+            }
         }
     }
 
diff --git a/app/src/main/java/awais/instagrabber/managers/ThreadManager.java b/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
index 8efff504..6a81e3dc 100644
--- a/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
+++ b/app/src/main/java/awais/instagrabber/managers/ThreadManager.java
@@ -27,6 +27,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -91,14 +92,14 @@ public final class ThreadManager {
     private final MutableLiveData<DirectThreadParticipantRequestsResponse> pendingRequests = new MutableLiveData<>(null);
 
     private final String threadId;
-    private final DirectMessagesService service;
     private final long viewerId;
     private final ThreadIdOrUserIds threadIdOrUserIds;
     private final User currentUser;
     private final ContentResolver contentResolver;
-    private final MediaService mediaService;
-    private final FriendshipService friendshipService;
 
+    private DirectMessagesService service;
+    private MediaService mediaService;
+    private FriendshipService friendshipService;
     private InboxManager inboxManager;
     private LiveData<DirectThread> thread;
     private LiveData<Integer> inputMode;
@@ -156,9 +157,10 @@ public final class ThreadManager {
         viewerId = CookieUtils.getUserIdFromCookie(cookie);
         final String deviceUuid = settingsHelper.getString(Constants.DEVICE_UUID);
         final String csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
-        if (TextUtils.isEmpty(csrfToken) || viewerId <= 0 || TextUtils.isEmpty(deviceUuid)) {
-            throw new IllegalArgumentException("User is not logged in!");
-        }
+        if (csrfToken == null) return;
+        // if (TextUtils.isEmpty(csrfToken) || viewerId <= 0 || TextUtils.isEmpty(deviceUuid)) {
+        //     throw new IllegalArgumentException("User is not logged in!");
+        // }
         service = DirectMessagesService.getInstance(csrfToken, viewerId, deviceUuid);
         mediaService = MediaService.getInstance(deviceUuid, csrfToken, viewerId);
         friendshipService = FriendshipService.getInstance(deviceUuid, csrfToken, viewerId);
@@ -187,7 +189,7 @@ public final class ThreadManager {
                 return null;
             }
             final DirectThread thread = threads.stream()
-                                               .filter(t -> t.getThreadId().equals(threadId))
+                                               .filter(t -> Objects.equals(t.getThreadId(), threadId))
                                                .findFirst()
                                                .orElse(null);
             if (thread != null) {
@@ -564,6 +566,7 @@ public final class ThreadManager {
     private List<DirectItemEmojiReaction> addEmoji(final List<DirectItemEmojiReaction> reactionList,
                                                    final String emoji,
                                                    final boolean shouldReplaceIfAlreadyReacted) {
+        if (currentUser == null) return reactionList;
         final List<DirectItemEmojiReaction> temp = reactionList == null ? new ArrayList<>() : new ArrayList<>(reactionList);
         int index = -1;
         for (int i = 0; i < temp.size(); i++) {
@@ -582,8 +585,7 @@ public final class ThreadManager {
         if (index < 0) {
             temp.add(0, reaction);
         } else if (shouldReplaceIfAlreadyReacted) {
-            temp.add(0, reaction);
-            temp.remove(index);
+            temp.set(index, reaction);
         }
         return temp;
     }
@@ -733,6 +735,7 @@ public final class ThreadManager {
         });
     }
 
+    @NonNull
     public LiveData<Resource<Object>> sendReaction(final DirectItem item, final Emoji emoji) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
         final Long userId = getCurrentUserId(data);
@@ -1311,6 +1314,7 @@ public final class ThreadManager {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
         final Call<DirectThreadDetailsChangeResponse> addUsersRequest = service.addUsers(threadId,
                                                                                          users.stream()
+                                                                                              .filter(Objects::nonNull)
                                                                                               .map(User::getPk)
                                                                                               .collect(Collectors.toList()));
         handleDetailsChangeRequest(data, addUsersRequest);
@@ -1319,6 +1323,10 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> removeMember(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) {
+            data.postValue(Resource.error("user is null!", null));
+            return data;
+        }
         final Call<String> request = service.removeUsers(threadId, Collections.singleton(user.getPk()));
         request.enqueue(new Callback<String>() {
             @Override
@@ -1337,6 +1345,7 @@ public final class ThreadManager {
                     leftUsersValue = Collections.emptyList();
                 }
                 final List<User> updatedActiveUsers = activeUsers.stream()
+                                                                 .filter(Objects::nonNull)
                                                                  .filter(u -> u.getPk() != user.getPk())
                                                                  .collect(Collectors.toList());
                 final ImmutableList.Builder<User> updatedLeftUsersBuilder = ImmutableList.<User>builder().addAll(leftUsersValue);
@@ -1357,12 +1366,14 @@ public final class ThreadManager {
     }
 
     public boolean isAdmin(final User user) {
+        if (user == null) return false;
         final List<Long> adminUserIdsValue = adminUserIds.getValue();
         return adminUserIdsValue != null && adminUserIdsValue.contains(user.getPk());
     }
 
     public LiveData<Resource<Object>> makeAdmin(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         if (isAdmin(user)) return data;
         final Call<String> request = service.addAdmins(threadId, Collections.singleton(user.getPk()));
         request.enqueue(new Callback<String>() {
@@ -1399,6 +1410,7 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> removeAdmin(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         if (!isAdmin(user)) return data;
         final Call<String> request = service.removeAdmins(threadId, Collections.singleton(user.getPk()));
         request.enqueue(new Callback<String>() {
@@ -1411,6 +1423,7 @@ public final class ThreadManager {
                 final List<Long> currentAdmins = adminUserIds.getValue();
                 if (currentAdmins == null) return;
                 final List<Long> updatedAdminUserIds = currentAdmins.stream()
+                                                                    .filter(Objects::nonNull)
                                                                     .filter(userId1 -> userId1 != user.getPk())
                                                                     .collect(Collectors.toList());
                 final DirectThread currentThread = ThreadManager.this.thread.getValue();
@@ -1583,6 +1596,7 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> blockUser(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         friendshipService.block(user.getPk(), new ServiceCallback<FriendshipChangeResponse>() {
             @Override
             public void onSuccess(final FriendshipChangeResponse result) {
@@ -1600,6 +1614,7 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> unblockUser(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         friendshipService.unblock(user.getPk(), new ServiceCallback<FriendshipChangeResponse>() {
             @Override
             public void onSuccess(final FriendshipChangeResponse result) {
@@ -1617,6 +1632,7 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> restrictUser(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         friendshipService.toggleRestrict(user.getPk(), true, new ServiceCallback<FriendshipRestrictResponse>() {
             @Override
             public void onSuccess(final FriendshipRestrictResponse result) {
@@ -1634,6 +1650,7 @@ public final class ThreadManager {
 
     public LiveData<Resource<Object>> unRestrictUser(final User user) {
         final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        if (user == null) return data;
         friendshipService.toggleRestrict(user.getPk(), false, new ServiceCallback<FriendshipRestrictResponse>() {
             @Override
             public void onSuccess(final FriendshipRestrictResponse result) {
@@ -1654,7 +1671,10 @@ public final class ThreadManager {
         data.postValue(Resource.loading(null));
         final Call<DirectThreadDetailsChangeResponse> approveUsersRequest = service
                 .approveParticipantRequests(threadId,
-                                            users.stream().map(User::getPk).collect(Collectors.toList()));
+                                            users.stream()
+                                                 .filter(Objects::nonNull)
+                                                 .map(User::getPk)
+                                                 .collect(Collectors.toList()));
         handleDetailsChangeRequest(data, approveUsersRequest, () -> pendingUserApproveDenySuccessAction(users));
         return data;
     }
@@ -1811,6 +1831,7 @@ public final class ThreadManager {
             @Override
             public void onResponse(@NonNull final Call<DirectItemSeenResponse> call,
                                    @NonNull final Response<DirectItemSeenResponse> response) {
+                if (currentUser == null) return;
                 if (!response.isSuccessful()) {
                     handleErrorBody(call, response, data);
                     return;
diff --git a/app/src/main/java/awais/instagrabber/models/Comment.java b/app/src/main/java/awais/instagrabber/models/Comment.java
new file mode 100644
index 00000000..d8ff3cb5
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/models/Comment.java
@@ -0,0 +1,117 @@
+package awais.instagrabber.models;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+import awais.instagrabber.repositories.responses.User;
+import awais.instagrabber.utils.Utils;
+
+public class Comment implements Serializable, Cloneable {
+    private final User user;
+    private final String id;
+    private final String text;
+    private long likes;
+    private final long timestamp;
+    private boolean liked;
+    private final int replyCount;
+    private final boolean isChild;
+
+    public Comment(final String id,
+                   final String text,
+                   final long timestamp,
+                   final long likes,
+                   final boolean liked,
+                   final User user,
+                   final int replyCount, final boolean isChild) {
+        this.id = id;
+        this.text = text;
+        this.likes = likes;
+        this.liked = liked;
+        this.timestamp = timestamp;
+        this.user = user;
+        this.replyCount = replyCount;
+        this.isChild = isChild;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    @NonNull
+    public String getDateTime() {
+        return Utils.datetimeParser.format(new Date(timestamp * 1000L));
+    }
+
+    public long getLikes() {
+        return likes;
+    }
+
+    public boolean getLiked() {
+        return liked;
+    }
+
+    public void setLiked(boolean liked) {
+        this.likes = liked ? likes + 1 : likes - 1;
+        this.liked = liked;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public int getReplyCount() {
+        return replyCount;
+    }
+
+    public boolean isChild() {
+        return isChild;
+    }
+
+    @NonNull
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final Comment comment = (Comment) o;
+        return likes == comment.likes &&
+                timestamp == comment.timestamp &&
+                liked == comment.liked &&
+                replyCount == comment.replyCount &&
+                Objects.equals(user, comment.user) &&
+                Objects.equals(id, comment.id) &&
+                Objects.equals(text, comment.text) &&
+                isChild == comment.isChild;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(user, id, text, likes, timestamp, liked, replyCount, isChild);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "Comment{" +
+                "user=" + user +
+                ", id='" + id + '\'' +
+                ", text='" + text + '\'' +
+                ", likes=" + likes +
+                ", timestamp=" + timestamp +
+                ", liked=" + liked +
+                ", replyCount" + replyCount +
+                ", isChild" + isChild +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/models/CommentModel.java b/app/src/main/java/awais/instagrabber/models/CommentModel.java
deleted file mode 100755
index 3331cf87..00000000
--- a/app/src/main/java/awais/instagrabber/models/CommentModel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package awais.instagrabber.models;
-
-import androidx.annotation.NonNull;
-
-import java.util.Date;
-import java.util.List;
-
-import awais.instagrabber.repositories.responses.User;
-import awais.instagrabber.utils.Utils;
-
-public class CommentModel {
-    private final User profileModel;
-    private final String id;
-    private final String text;
-    private long likes;
-    private final long timestamp;
-    private List<CommentModel> childCommentModels;
-    private boolean liked, hasNextPage;
-    private String endCursor;
-
-    public CommentModel(final String id,
-                        final String text,
-                        final long timestamp,
-                        final long likes,
-                        final boolean liked,
-                        final User profileModel) {
-        this.id = id;
-        this.text = text;
-        this.likes = likes;
-        this.liked = liked;
-        this.timestamp = timestamp;
-        this.profileModel = profileModel;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    @NonNull
-    public String getDateTime() {
-        return Utils.datetimeParser.format(new Date(timestamp * 1000L));
-    }
-
-    public long getLikes() {
-        return likes;
-    }
-
-    public boolean getLiked() {
-        return liked;
-    }
-
-    public void setLiked(boolean liked) {
-        this.likes = liked ? likes + 1 : likes - 1;
-        this.liked = liked;
-    }
-
-    public User getProfileModel() {
-        return profileModel;
-    }
-
-    public List<CommentModel> getChildCommentModels() {
-        return childCommentModels;
-    }
-
-    public void setChildCommentModels(final List<CommentModel> childCommentModels) {
-        this.childCommentModels = childCommentModels;
-    }
-
-    public void setPageCursor(final boolean hasNextPage, final String endCursor) {
-        this.hasNextPage = hasNextPage;
-        this.endCursor = endCursor;
-    }
-
-    public boolean hasNextPage() {
-        return hasNextPage;
-    }
-
-    public String getEndCursor() {
-        return endCursor;
-    }
-
-    //    @NonNull
-    //    @Override
-    //    public String toString() {
-    //        try {
-    //            final JSONObject object = new JSONObject();
-    //            object.put(Constants.EXTRAS_ID, id);
-    //            object.put("text", text);
-    //            object.put(Constants.EXTRAS_NAME, profileModel != null ? profileModel.getUsername() : "");
-    //            if (childCommentModels != null) object.put("childComments", childCommentModels);
-    //            return object.toString();
-    //        } catch (Exception e) {
-    //            return "{\"id\":\"" + id + "\", \"text\":\"" + text
-    //                     //(text != null ? text.replaceAll("\"", "\\\\\"") : "")
-    //                    + "\", \"name\":\"" + (profileModel != null ? profileModel.getUsername() : "") +
-    //                    (childCommentModels != null ? "\", \"childComments\":" + childCommentModels.length : "\"") + '}';
-    //        }
-    //    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/models/enums/FavoriteType.java b/app/src/main/java/awais/instagrabber/models/enums/FavoriteType.java
index cdf926a9..536ac05f 100644
--- a/app/src/main/java/awais/instagrabber/models/enums/FavoriteType.java
+++ b/app/src/main/java/awais/instagrabber/models/enums/FavoriteType.java
@@ -1,7 +1,8 @@
 package awais.instagrabber.models.enums;
 
 public enum FavoriteType {
+    TOP, // used just for searching
     USER,
     HASHTAG,
-    LOCATION
+    LOCATION,
 }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/GraphQLCommentsFetchResponse.java b/app/src/main/java/awais/instagrabber/repositories/responses/GraphQLCommentsFetchResponse.java
new file mode 100644
index 00000000..22c3c7b9
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/GraphQLCommentsFetchResponse.java
@@ -0,0 +1,51 @@
+package awais.instagrabber.repositories.responses;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+import awais.instagrabber.models.Comment;
+
+public class GraphQLCommentsFetchResponse {
+    private final int count;
+    private final String cursor;
+    private final boolean hasNext;
+    private final List<Comment> comments;
+
+    public GraphQLCommentsFetchResponse(final int count,
+                                        final String cursor,
+                                        final boolean hasNext,
+                                        final List<Comment> comments) {
+        this.count = count;
+        this.cursor = cursor;
+        this.hasNext = hasNext;
+        this.comments = comments;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public String getCursor() {
+        return cursor;
+    }
+
+    public boolean hasNext() {
+        return hasNext;
+    }
+
+    public List<Comment> getComments() {
+        return comments;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "GraphQLCommentsFetchResponse{" +
+                "count=" + count +
+                ", cursor='" + cursor + '\'' +
+                ", hasNext=" + hasNext +
+                ", comments=" + comments +
+                '}';
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/Hashtag.java b/app/src/main/java/awais/instagrabber/repositories/responses/Hashtag.java
index 2ce08eb5..f1ef47b3 100755
--- a/app/src/main/java/awais/instagrabber/repositories/responses/Hashtag.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/Hashtag.java
@@ -1,6 +1,7 @@
 package awais.instagrabber.repositories.responses;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import awais.instagrabber.models.enums.FollowingType;
 
@@ -42,4 +43,21 @@ public final class Hashtag implements Serializable {
     public String getSubtitle() {
         return searchResultSubtitle;
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final Hashtag hashtag = (Hashtag) o;
+        return mediaCount == hashtag.mediaCount &&
+                following == hashtag.following &&
+                Objects.equals(id, hashtag.id) &&
+                Objects.equals(name, hashtag.name) &&
+                Objects.equals(searchResultSubtitle, hashtag.searchResultSubtitle);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(following, mediaCount, id, name, searchResultSubtitle);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/Media.java b/app/src/main/java/awais/instagrabber/repositories/responses/Media.java
index c11669a8..135eee89 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/Media.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/Media.java
@@ -34,7 +34,7 @@ public class Media implements Serializable {
     private final boolean hasAudio;
     private final double videoDuration;
     private final long viewCount;
-    private final Caption caption;
+    private Caption caption;
     private final boolean canViewerSave;
     private final Audio audio;
     private final String title;
@@ -271,7 +271,14 @@ public class Media implements Serializable {
     }
 
     public void setPostCaption(final String caption) {
-        final Caption caption1 = getCaption();
+        Caption caption1 = getCaption();
+        if (caption1 == null) {
+            final User user = getUser();
+            if (user == null) return;
+            caption1 = new Caption(user.getPk(), caption);
+            this.caption = caption1;
+            return;
+        }
         caption1.setText(caption);
     }
 
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/Place.java b/app/src/main/java/awais/instagrabber/repositories/responses/Place.java
index c72e1c41..3f10ffd4 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/Place.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/Place.java
@@ -1,5 +1,7 @@
 package awais.instagrabber.repositories.responses;
 
+import java.util.Objects;
+
 public class Place {
     private final Location location;
     // for search
@@ -40,4 +42,21 @@ public class Place {
     public String getStatus() {
         return status;
     }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final Place place = (Place) o;
+        return Objects.equals(location, place.location) &&
+                Objects.equals(title, place.title) &&
+                Objects.equals(subtitle, place.subtitle) &&
+                Objects.equals(slug, place.slug) &&
+                Objects.equals(status, place.status);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(location, title, subtitle, slug, status);
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItem.java b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItem.java
index 52ad8818..221afd79 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItem.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItem.java
@@ -229,7 +229,6 @@ public class DirectItem implements Cloneable, Serializable {
     public LocalDateTime getLocalDateTime() {
         if (localDateTime == null) {
             localDateTime = Instant.ofEpochMilli(timestamp / 1000).atZone(ZoneId.systemDefault()).toLocalDateTime();
-            ;
         }
         return localDateTime;
     }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemEmojiReaction.java b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemEmojiReaction.java
index c0a8b124..068c17f6 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemEmojiReaction.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemEmojiReaction.java
@@ -47,4 +47,14 @@ public class DirectItemEmojiReaction implements Serializable {
     public int hashCode() {
         return Objects.hash(senderId, timestamp, emoji, superReactType);
     }
+
+    @Override
+    public String toString() {
+        return "DirectItemEmojiReaction{" +
+                "senderId=" + senderId +
+                ", timestamp=" + timestamp +
+                ", emoji='" + emoji + '\'' +
+                ", superReactType='" + superReactType + '\'' +
+                '}';
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemReactions.java b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemReactions.java
index 4b344e14..30d3cf6c 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemReactions.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectItemReactions.java
@@ -51,4 +51,12 @@ public class DirectItemReactions implements Cloneable, Serializable {
     public int hashCode() {
         return Objects.hash(emojis, likes);
     }
+
+    @Override
+    public String toString() {
+        return "DirectItemReactions{" +
+                "emojis=" + emojis +
+                ", likes=" + likes +
+                '}';
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/search/SearchItem.java b/app/src/main/java/awais/instagrabber/repositories/responses/search/SearchItem.java
index 4aca79da..f99c7dfd 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/search/SearchItem.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/search/SearchItem.java
@@ -1,15 +1,34 @@
 package awais.instagrabber.repositories.responses.search;
 
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import awais.instagrabber.db.entities.Favorite;
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.models.enums.FavoriteType;
 import awais.instagrabber.repositories.responses.Hashtag;
+import awais.instagrabber.repositories.responses.Location;
 import awais.instagrabber.repositories.responses.Place;
 import awais.instagrabber.repositories.responses.User;
 
 public class SearchItem {
+    private static final String TAG = SearchItem.class.getSimpleName();
+
     private final User user;
     private final Place place;
     private final Hashtag hashtag;
     private final int position;
 
+    private boolean isRecent = false;
+    private boolean isFavorite = false;
+
     public SearchItem(final User user,
                       final Place place,
                       final Hashtag hashtag,
@@ -35,4 +54,221 @@ public class SearchItem {
     public int getPosition() {
         return position;
     }
+
+    public boolean isRecent() {
+        return isRecent;
+    }
+
+    public void setRecent(final boolean recent) {
+        isRecent = recent;
+    }
+
+    public boolean isFavorite() {
+        return isFavorite;
+    }
+
+    public void setFavorite(final boolean favorite) {
+        isFavorite = favorite;
+    }
+
+    @Nullable
+    public FavoriteType getType() {
+        if (user != null) {
+            return FavoriteType.USER;
+        }
+        if (hashtag != null) {
+            return FavoriteType.HASHTAG;
+        }
+        if (place != null) {
+            return FavoriteType.LOCATION;
+        }
+        return null;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        final SearchItem that = (SearchItem) o;
+        return Objects.equals(user, that.user) &&
+                Objects.equals(place, that.place) &&
+                Objects.equals(hashtag, that.hashtag);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(user, place, hashtag);
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "SearchItem{" +
+                "user=" + user +
+                ", place=" + place +
+                ", hashtag=" + hashtag +
+                ", position=" + position +
+                ", isRecent=" + isRecent +
+                '}';
+    }
+
+    @NonNull
+    public static List<SearchItem> fromRecentSearch(final List<RecentSearch> recentSearches) {
+        if (recentSearches == null) return Collections.emptyList();
+        return recentSearches.stream()
+                             .map(SearchItem::fromRecentSearch)
+                             .filter(Objects::nonNull)
+                             .collect(Collectors.toList());
+    }
+
+    @Nullable
+    private static SearchItem fromRecentSearch(final RecentSearch recentSearch) {
+        if (recentSearch == null) return null;
+        try {
+            final FavoriteType type = recentSearch.getType();
+            final SearchItem searchItem;
+            switch (type) {
+                case USER:
+                    searchItem = new SearchItem(getUser(recentSearch), null, null, 0);
+                    break;
+                case HASHTAG:
+                    searchItem = new SearchItem(null, null, getHashtag(recentSearch), 0);
+                    break;
+                case LOCATION:
+                    searchItem = new SearchItem(null, getPlace(recentSearch), null, 0);
+                    break;
+                default:
+                    return null;
+            }
+            searchItem.setRecent(true);
+            return searchItem;
+        } catch (Exception e) {
+            Log.e(TAG, "fromRecentSearch: ", e);
+        }
+        return null;
+    }
+
+    public static List<SearchItem> fromFavorite(final List<Favorite> favorites) {
+        if (favorites == null) {
+            return Collections.emptyList();
+        }
+        return favorites.stream()
+                        .map(SearchItem::fromFavorite)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
+    }
+
+    @Nullable
+    private static SearchItem fromFavorite(final Favorite favorite) {
+        if (favorite == null) return null;
+        final FavoriteType type = favorite.getType();
+        if (type == null) return null;
+        final SearchItem searchItem;
+        switch (type) {
+            case USER:
+                searchItem = new SearchItem(getUser(favorite), null, null, 0);
+                break;
+            case HASHTAG:
+                searchItem = new SearchItem(null, null, getHashtag(favorite), 0);
+                break;
+            case LOCATION:
+                final Place place = getPlace(favorite);
+                if (place == null) return null;
+                searchItem = new SearchItem(null, place, null, 0);
+                break;
+            default:
+                return null;
+        }
+        searchItem.setFavorite(true);
+        return searchItem;
+    }
+
+    @NonNull
+    private static User getUser(@NonNull final RecentSearch recentSearch) {
+        return new User(
+                Long.parseLong(recentSearch.getIgId()),
+                recentSearch.getUsername(),
+                recentSearch.getName(),
+                false,
+                recentSearch.getPicUrl(),
+                null, null, false, false, false, false, false,
+                null, null, 0, 0, 0, 0, null, null,
+                0, null, null, null, null, null, null
+        );
+    }
+
+    @NonNull
+    private static User getUser(@NonNull final Favorite favorite) {
+        return new User(
+                0,
+                favorite.getQuery(),
+                favorite.getDisplayName(),
+                false,
+                favorite.getPicUrl(),
+                null, null, false, false, false, false, false,
+                null, null, 0, 0, 0, 0, null, null,
+                0, null, null, null, null, null, null
+        );
+    }
+
+    @NonNull
+    private static Hashtag getHashtag(@NonNull final RecentSearch recentSearch) {
+        return new Hashtag(
+                recentSearch.getIgId(),
+                recentSearch.getName(),
+                0,
+                null,
+                null
+        );
+    }
+
+    @NonNull
+    private static Hashtag getHashtag(@NonNull final Favorite favorite) {
+        return new Hashtag(
+                "0",
+                favorite.getQuery(),
+                0,
+                null,
+                null
+        );
+    }
+
+    @NonNull
+    private static Place getPlace(@NonNull final RecentSearch recentSearch) {
+        final Location location = new Location(
+                Long.parseLong(recentSearch.getIgId()),
+                recentSearch.getName(),
+                recentSearch.getName(),
+                null, null, 0, 0
+        );
+        return new Place(
+                location,
+                recentSearch.getName(),
+                null,
+                null,
+                null
+        );
+    }
+
+    @Nullable
+    private static Place getPlace(@NonNull final Favorite favorite) {
+        try {
+            final Location location = new Location(
+                    Long.parseLong(favorite.getQuery()),
+                    favorite.getDisplayName(),
+                    favorite.getDisplayName(),
+                    null, null, 0, 0
+            );
+            return new Place(
+                    location,
+                    favorite.getDisplayName(),
+                    null,
+                    null,
+                    null
+            );
+        } catch (Exception e) {
+            Log.e(TAG, "getPlace: ", e);
+            return null;
+        }
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/utils/BitmapUtils.java b/app/src/main/java/awais/instagrabber/utils/BitmapUtils.java
index c1241ebd..4e7a300d 100644
--- a/app/src/main/java/awais/instagrabber/utils/BitmapUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/BitmapUtils.java
@@ -127,47 +127,9 @@ public final class BitmapUtils {
                                    final boolean addToCache,
                                    final ThumbnailLoadCallback callback) {
         if (contentResolver == null || uri == null || callback == null) return;
-        final ListenableFuture<BitmapResult> future = appExecutors.tasksThread().submit(() -> {
-            BitmapFactory.Options bitmapOptions;
-            float actualReqWidth = reqWidth;
-            float actualReqHeight = reqHeight;
-            try (InputStream input = contentResolver.openInputStream(uri)) {
-                BitmapFactory.Options outBounds = new BitmapFactory.Options();
-                outBounds.inJustDecodeBounds = true;
-                outBounds.inPreferredConfig = Bitmap.Config.ARGB_8888;
-                BitmapFactory.decodeStream(input, null, outBounds);
-                if ((outBounds.outWidth == -1) || (outBounds.outHeight == -1)) return null;
-                bitmapOptions = new BitmapFactory.Options();
-                if (maxDimenSize > 0) {
-                    // Raw height and width of image
-                    final int height = outBounds.outHeight;
-                    final int width = outBounds.outWidth;
-                    final float ratio = (float) width / height;
-                    if (height > width) {
-                        actualReqHeight = maxDimenSize;
-                        actualReqWidth = actualReqHeight * ratio;
-                    } else {
-                        actualReqWidth = maxDimenSize;
-                        actualReqHeight = actualReqWidth / ratio;
-                    }
-                }
-                bitmapOptions.inSampleSize = calculateInSampleSize(outBounds, actualReqWidth, actualReqHeight);
-            } catch (Exception e) {
-                Log.e(TAG, "loadBitmap: ", e);
-                return null;
-            }
-            try (InputStream input = contentResolver.openInputStream(uri)) {
-                bitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;
-                Bitmap bitmap = BitmapFactory.decodeStream(input, null, bitmapOptions);
-                if (addToCache) {
-                    addBitmapToMemoryCache(uri.toString(), bitmap, true);
-                }
-                return new BitmapResult(bitmap, (int) actualReqWidth, (int) actualReqHeight);
-            } catch (Exception e) {
-                Log.e(TAG, "loadBitmap: ", e);
-            }
-            return null;
-        });
+        final ListenableFuture<BitmapResult> future = appExecutors
+                .tasksThread()
+                .submit(() -> getBitmapResult(contentResolver, uri, reqWidth, reqHeight, maxDimenSize, addToCache));
         Futures.addCallback(future, new FutureCallback<BitmapResult>() {
             @Override
             public void onSuccess(@Nullable final BitmapResult result) {
@@ -185,8 +147,56 @@ public final class BitmapUtils {
         }, callbackHandlers);
     }
 
-    private static class BitmapResult {
-        Bitmap bitmap;
+    @Nullable
+    public static BitmapResult getBitmapResult(final ContentResolver contentResolver,
+                                                final Uri uri,
+                                                final float reqWidth,
+                                                final float reqHeight,
+                                                final float maxDimenSize,
+                                                final boolean addToCache) {
+        BitmapFactory.Options bitmapOptions;
+        float actualReqWidth = reqWidth;
+        float actualReqHeight = reqHeight;
+        try (InputStream input = contentResolver.openInputStream(uri)) {
+            BitmapFactory.Options outBounds = new BitmapFactory.Options();
+            outBounds.inJustDecodeBounds = true;
+            outBounds.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            BitmapFactory.decodeStream(input, null, outBounds);
+            if ((outBounds.outWidth == -1) || (outBounds.outHeight == -1)) return null;
+            bitmapOptions = new BitmapFactory.Options();
+            if (maxDimenSize > 0) {
+                // Raw height and width of image
+                final int height = outBounds.outHeight;
+                final int width = outBounds.outWidth;
+                final float ratio = (float) width / height;
+                if (height > width) {
+                    actualReqHeight = maxDimenSize;
+                    actualReqWidth = actualReqHeight * ratio;
+                } else {
+                    actualReqWidth = maxDimenSize;
+                    actualReqHeight = actualReqWidth / ratio;
+                }
+            }
+            bitmapOptions.inSampleSize = calculateInSampleSize(outBounds, actualReqWidth, actualReqHeight);
+        } catch (Exception e) {
+            Log.e(TAG, "loadBitmap: ", e);
+            return null;
+        }
+        try (InputStream input = contentResolver.openInputStream(uri)) {
+            bitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            Bitmap bitmap = BitmapFactory.decodeStream(input, null, bitmapOptions);
+            if (addToCache) {
+                addBitmapToMemoryCache(uri.toString(), bitmap, true);
+            }
+            return new BitmapResult(bitmap, (int) actualReqWidth, (int) actualReqHeight);
+        } catch (Exception e) {
+            Log.e(TAG, "loadBitmap: ", e);
+        }
+        return null;
+    }
+
+    public static class BitmapResult {
+        public Bitmap bitmap;
         int width;
         int height;
 
diff --git a/app/src/main/java/awais/instagrabber/utils/CombinedDrawable.java b/app/src/main/java/awais/instagrabber/utils/CombinedDrawable.java
index a7016e95..6aa9b9b6 100644
--- a/app/src/main/java/awais/instagrabber/utils/CombinedDrawable.java
+++ b/app/src/main/java/awais/instagrabber/utils/CombinedDrawable.java
@@ -36,11 +36,6 @@ public class CombinedDrawable extends Drawable implements Drawable.Callback {
         }
     }
 
-    public void setIconSize(int width, int height) {
-        iconWidth = width;
-        iconHeight = height;
-    }
-
     public CombinedDrawable(Drawable backgroundDrawable, Drawable iconDrawable) {
         background = backgroundDrawable;
         icon = iconDrawable;
@@ -49,6 +44,11 @@ public class CombinedDrawable extends Drawable implements Drawable.Callback {
         }
     }
 
+    public void setIconSize(int width, int height) {
+        iconWidth = width;
+        iconHeight = height;
+    }
+
     public void setCustomSize(int width, int height) {
         backWidth = width;
         backHeight = height;
@@ -82,11 +82,12 @@ public class CombinedDrawable extends Drawable implements Drawable.Callback {
     }
 
     @Override
-    public boolean setState(int[] stateSet) {
+    public boolean setState(@NonNull int[] stateSet) {
         icon.setState(stateSet);
         return true;
     }
 
+    @NonNull
     @Override
     public int[] getState() {
         return icon.getState();
@@ -108,7 +109,7 @@ public class CombinedDrawable extends Drawable implements Drawable.Callback {
     }
 
     @Override
-    public void draw(Canvas canvas) {
+    public void draw(@NonNull Canvas canvas) {
         background.setBounds(getBounds());
         background.draw(canvas);
         if (icon != null) {
diff --git a/app/src/main/java/awais/instagrabber/utils/Constants.java b/app/src/main/java/awais/instagrabber/utils/Constants.java
index d305010b..9f79641e 100644
--- a/app/src/main/java/awais/instagrabber/utils/Constants.java
+++ b/app/src/main/java/awais/instagrabber/utils/Constants.java
@@ -20,6 +20,8 @@ public final class Constants {
     // boolean prefs
     public static final String DOWNLOAD_USER_FOLDER = "download_user_folder";
     public static final String TOGGLE_KEYWORD_FILTER = "toggle_keyword_filter";
+    public static final String DOWNLOAD_PREPEND_USER_NAME = "download_user_name";
+    public static final String PLAY_IN_BACKGROUND = "play_in_background";
     // deprecated: public static final String BOTTOM_TOOLBAR = "bottom_toolbar";
     public static final String FOLDER_SAVE_TO = "saved_to";
     public static final String AUTOPLAY_VIDEOS = "autoplay_videos";
@@ -113,6 +115,7 @@ public final class Constants {
     public static final int SHOW_ACTIVITY_REQUEST_CODE = 1738;
     public static final int SHOW_DM_THREAD = 2000;
     public static final int DM_SYNC_SERVICE_REQUEST_CODE = 3000;
+    public static final int GLOBAL_NETWORK_ERROR_DIALOG_REQUEST_CODE = 7777;
 
     public static final String ACTION_SHOW_ACTIVITY = "show_activity";
     public static final String ACTION_SHOW_DM_THREAD = "show_dm_thread";
diff --git a/app/src/main/java/awais/instagrabber/utils/DMUtils.java b/app/src/main/java/awais/instagrabber/utils/DMUtils.java
index 12aa2e07..904a7055 100644
--- a/app/src/main/java/awais/instagrabber/utils/DMUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/DMUtils.java
@@ -23,18 +23,21 @@ import awais.instagrabber.repositories.responses.directmessages.DirectThreadLast
 import awais.instagrabber.repositories.responses.directmessages.RavenExpiringMediaActionSummary;
 
 public final class DMUtils {
-    public static boolean isRead(final DirectItem item,
+    public static boolean isRead(@NonNull final DirectItem item,
                                  @NonNull final Map<Long, DirectThreadLastSeenAt> lastSeenAt,
-                                 final List<Long> userIdsToCheck) {
+                                 @NonNull final List<Long> userIdsToCheck) {
         // Further check if directStory exists
         // if (read && directStory != null) {
         //     read = false;
         // }
+        if (item == null) return false;
         return lastSeenAt.entrySet()
                          .stream()
                          .filter(entry -> userIdsToCheck.contains(entry.getKey()))
                          .anyMatch(entry -> {
-                             final String userLastSeenTsString = entry.getValue().getTimestamp();
+                             final DirectThreadLastSeenAt threadLastSeenAt = entry.getValue();
+                             if (threadLastSeenAt == null) return false;
+                             final String userLastSeenTsString = threadLastSeenAt.getTimestamp();
                              if (userLastSeenTsString == null) return false;
                              final long userTs = Long.parseLong(userLastSeenTsString);
                              final long itemTs = item.getTimestamp();
diff --git a/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java b/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
index 12b46b35..18bf59c7 100644
--- a/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
@@ -116,23 +116,34 @@ public final class DownloadUtils {
     private static File getDownloadSaveFile(final File finalDir,
                                             final String postId,
                                             final String displayUrl) {
-        return getDownloadSaveFile(finalDir, postId, "", displayUrl);
+        return getDownloadSaveFile(finalDir, postId, "", displayUrl, "");
+    }
+
+    @NonNull
+    private static File getDownloadSaveFile(final File finalDir,
+                                            final String postId,
+                                            final String displayUrl,
+                                            final String username) {
+        return getDownloadSaveFile(finalDir, postId, "", displayUrl, username);
     }
 
     private static File getDownloadChildSaveFile(final File downloadDir,
                                                  final String postId,
                                                  final int childPosition,
-                                                 final String url) {
+                                                 final String url,
+                                                 final String username) {
         final String sliderPostfix = "_slide_" + childPosition;
-        return getDownloadSaveFile(downloadDir, postId, sliderPostfix, url);
+        return getDownloadSaveFile(downloadDir, postId, sliderPostfix, url, username);
     }
 
     @NonNull
     private static File getDownloadSaveFile(final File finalDir,
                                             final String postId,
                                             final String sliderPostfix,
-                                            final String displayUrl) {
-        final String fileName = postId + sliderPostfix + getFileExtensionFromUrl(displayUrl);
+                                            final String displayUrl,
+                                            final String username) {
+        final String usernamePrepend = TextUtils.isEmpty(username) ? "" : (username + "_");
+        final String fileName = usernamePrepend + postId + sliderPostfix + getFileExtensionFromUrl(displayUrl);
         return new File(finalDir, fileName);
     }
 
@@ -205,8 +216,9 @@ public final class DownloadUtils {
             case MEDIA_TYPE_IMAGE:
             case MEDIA_TYPE_VIDEO: {
                 final String url = ResponseBodyUtils.getImageUrl(media);
-                final File file = getDownloadSaveFile(downloadDir, media.getCode(), url);
-                checkList.add(file.exists());
+                final File file = getDownloadSaveFile(downloadDir, media.getCode(), url, "");
+                final File usernamePrependedFile = getDownloadSaveFile(downloadDir, media.getCode(), url, username);
+                checkList.add(file.exists() || usernamePrependedFile.exists());
                 break;
             }
             case MEDIA_TYPE_SLIDER:
@@ -215,8 +227,9 @@ public final class DownloadUtils {
                     final Media child = sliderItems.get(i);
                     if (child == null) continue;
                     final String url = ResponseBodyUtils.getImageUrl(child);
-                    final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url);
-                    checkList.add(file.exists());
+                    final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, "");
+                    final File usernamePrependedFile = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, username);
+                    checkList.add(file.exists() || usernamePrependedFile.exists());
                 }
                 break;
             default:
@@ -262,10 +275,12 @@ public final class DownloadUtils {
         final String url = storyModel.getItemType() == MediaItemType.MEDIA_TYPE_VIDEO
                            ? storyModel.getVideoUrl()
                            : storyModel.getStoryUrl();
+        final String baseFileName = storyModel.getStoryMediaId() + "_"
+                + storyModel.getTimestamp() + DownloadUtils.getFileExtensionFromUrl(url);
+        final String usernamePrepend = Utils.settingsHelper.getBoolean(Constants.DOWNLOAD_PREPEND_USER_NAME)
+                && storyModel.getUsername() != null ? storyModel.getUsername() + "_" : "";
         final File saveFile = new File(downloadDir,
-                                       storyModel.getStoryMediaId()
-                                               + "_" + storyModel.getTimestamp()
-                                               + DownloadUtils.getFileExtensionFromUrl(url));
+                 usernamePrepend + baseFileName);
         download(context, url, saveFile.getAbsolutePath());
     }
 
@@ -291,18 +306,21 @@ public final class DownloadUtils {
         final Map<String, String> map = new HashMap<>();
         for (final Media media : feedModels) {
             final User mediaUser = media.getUser();
-            final File downloadDir = getDownloadDir(context, mediaUser == null ? "" : "@" + mediaUser.getUsername());
+            final File downloadDir = getDownloadDir(context, mediaUser == null ? "" : mediaUser.getUsername());
             if (downloadDir == null) return;
             switch (media.getMediaType()) {
                 case MEDIA_TYPE_IMAGE:
                 case MEDIA_TYPE_VIDEO: {
                     final String url = getUrlOfType(media);
                     String fileName = media.getId();
-                    if (mediaUser != null) {
+                    if (mediaUser != null && TextUtils.isEmpty(media.getCode())) {
                         fileName = mediaUser.getUsername() + "_" + fileName;
                     }
                     if (!TextUtils.isEmpty(media.getCode())) {
                         fileName = media.getCode();
+                        if (Utils.settingsHelper.getBoolean(Constants.DOWNLOAD_PREPEND_USER_NAME) && mediaUser != null) {
+                            fileName = mediaUser.getUsername() + "_" + fileName;
+                        }
                     }
                     final File file = getDownloadSaveFile(downloadDir, fileName, url);
                     map.put(url, file.getAbsolutePath());
@@ -326,7 +344,8 @@ public final class DownloadUtils {
                         }
                         final Media child = sliderItems.get(i);
                         final String url = getUrlOfType(child);
-                        final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url);
+                        final String usernamePrepend = Utils.settingsHelper.getBoolean(Constants.DOWNLOAD_PREPEND_USER_NAME) && mediaUser != null ? mediaUser.getUsername() : "";
+                        final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, usernamePrepend);
                         map.put(url, file.getAbsolutePath());
                     }
                     break;
diff --git a/app/src/main/java/awais/instagrabber/utils/IntentUtils.java b/app/src/main/java/awais/instagrabber/utils/IntentUtils.java
index 80271c64..45af5970 100644
--- a/app/src/main/java/awais/instagrabber/utils/IntentUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/IntentUtils.java
@@ -12,6 +12,9 @@ public final class IntentUtils {
 
     @Nullable
     public static IntentModel parseUrl(@NonNull String url) {
+        if (url.contains("instagr.am/")) {
+            url = url.replaceFirst("s?://(?:www\\.)?instagr\\.am/", "s://www.instagram.com/");
+        }
         final int wwwDel = url.contains("www.") ? 4 : 0;
         final boolean isHttps = url.startsWith("https");
 
diff --git a/app/src/main/java/awais/instagrabber/utils/MediaUploader.java b/app/src/main/java/awais/instagrabber/utils/MediaUploader.java
index f9c47a91..beb5c1af 100644
--- a/app/src/main/java/awais/instagrabber/utils/MediaUploader.java
+++ b/app/src/main/java/awais/instagrabber/utils/MediaUploader.java
@@ -17,7 +17,7 @@ import java.util.Map;
 
 import awais.instagrabber.models.UploadPhotoOptions;
 import awais.instagrabber.models.UploadVideoOptions;
-import awais.instagrabber.webservices.AddCookiesInterceptor;
+import awais.instagrabber.webservices.interceptors.AddCookiesInterceptor;
 import okhttp3.Call;
 import okhttp3.Headers;
 import okhttp3.MediaType;
diff --git a/app/src/main/java/awais/instagrabber/utils/NavigationExtensions.java b/app/src/main/java/awais/instagrabber/utils/NavigationExtensions.java
index d04e44a3..a6bccbfd 100644
--- a/app/src/main/java/awais/instagrabber/utils/NavigationExtensions.java
+++ b/app/src/main/java/awais/instagrabber/utils/NavigationExtensions.java
@@ -1,6 +1,8 @@
 package awais.instagrabber.utils;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.util.Log;
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
@@ -10,6 +12,7 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.navigation.NavController;
+import androidx.navigation.NavDestination;
 import androidx.navigation.NavGraph;
 import androidx.navigation.fragment.NavHostFragment;
 
@@ -18,13 +21,15 @@ import com.google.android.material.bottomnavigation.BottomNavigationView;
 import java.util.List;
 
 import awais.instagrabber.R;
+import awais.instagrabber.customviews.NavHostFragmentWithDefaultAnimations;
+import awais.instagrabber.fragments.main.FeedFragment;
 
 /**
  * This is a Java rewrite of <a href="https://github.com/android/architecture-components-samples/blob/master/NavigationAdvancedSample/app/src/main/java/com/example/android/navigationadvancedsample/NavigationExtensions.kt">NavigationExtensions</a>
  * from architecture-components-samples. Some modifications have been done, check git history.
  */
 public class NavigationExtensions {
-
+    private static final String TAG = NavigationExtensions.class.getSimpleName();
     private static String selectedItemTag;
     private static boolean isOnFirstFragment;
 
@@ -105,7 +110,7 @@ public class NavigationExtensions {
             }
             return false;
         });
-        // setupItemReselected(bottomNavigationView, graphIdToTagMap, fragmentManager);
+        setupItemReselected(bottomNavigationView, graphIdToTagMap, fragmentManager);
         setupDeepLinks(bottomNavigationView, navGraphIds, fragmentManager, containerId, intent);
         final int finalFirstFragmentGraphId = firstFragmentGraphId;
         fragmentManager.addOnBackStackChangedListener(() -> {
@@ -135,7 +140,7 @@ public class NavigationExtensions {
         if (existingFragment != null) {
             return existingFragment;
         }
-        final NavHostFragment navHostFragment = NavHostFragment.create(navGraphId);
+        final NavHostFragment navHostFragment = NavHostFragmentWithDefaultAnimations.create(navGraphId);
         fragmentManager.beginTransaction()
                        .setReorderingAllowed(true)
                        .add(containerId, navHostFragment, fragmentTag)
@@ -160,6 +165,7 @@ public class NavigationExtensions {
                        .commitNow();
     }
 
+    @SuppressLint("RestrictedApi")
     private static void setupItemReselected(final BottomNavigationView bottomNavigationView,
                                             final SparseArray<String> graphIdToTagMap,
                                             final FragmentManager fragmentManager) {
@@ -168,12 +174,36 @@ public class NavigationExtensions {
             final Fragment fragmentByTag = fragmentManager.findFragmentByTag(newlySelectedItemTag);
             if (fragmentByTag == null) {
                 return;
-                // throw new NullPointerException("null cannot be cast to non-null type NavHostFragment");
             }
             final NavHostFragment selectedFragment = (NavHostFragment) fragmentByTag;
             final NavController navController = selectedFragment.getNavController();
             final NavGraph navControllerGraph = navController.getGraph();
-            navController.popBackStack(navControllerGraph.getStartDestination(), false);
+            final NavDestination currentDestination = navController.getCurrentDestination();
+            final int startDestination = navControllerGraph.getStartDestination();
+            int backStackSize = navController.getBackStack().size();
+            if (currentDestination != null && backStackSize == 2 && currentDestination.getId() == startDestination) {
+                // scroll to top
+                final List<Fragment> fragments = selectedFragment.getChildFragmentManager().getFragments();
+                if (fragments.isEmpty()) return;
+                final Fragment fragment = fragments.get(0);
+                if (fragment instanceof FeedFragment) {
+                    ((FeedFragment) fragment).scrollToTop();
+                }
+                return;
+            }
+            final boolean popped = navController.popBackStack(startDestination, false);
+            backStackSize = navController.getBackStack().size();
+            if (!popped || backStackSize > 2) {
+                try {
+                    // try loop pop
+                    do {
+                        navController.popBackStack();
+                        backStackSize = navController.getBackStack().size();
+                    } while (backStackSize > 2);
+                } catch (Exception e) {
+                    Log.e(TAG, "setupItemReselected: ", e);
+                }
+            }
         });
     }
 
diff --git a/app/src/main/java/awais/instagrabber/utils/NullSafePair.java b/app/src/main/java/awais/instagrabber/utils/NullSafePair.java
new file mode 100644
index 00000000..43c5a7d4
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/utils/NullSafePair.java
@@ -0,0 +1,91 @@
+package awais.instagrabber.utils;
+
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.ObjectsCompat;
+
+/**
+ * Container to ease passing around a tuple of two objects. This object provides a sensible
+ * implementation of equals(), returning true if equals() is true on each of the contained
+ * objects.
+ */
+public class NullSafePair<F, S> {
+    public final @NonNull
+    F first;
+    public final @NonNull
+    S second;
+
+    /**
+     * Constructor for a Pair.
+     *
+     * @param first  the first object in the Pair
+     * @param second the second object in the pair
+     */
+    public NullSafePair(@NonNull F first, @NonNull S second) {
+        this.first = first;
+        this.second = second;
+    }
+
+    /**
+     * Checks the two objects for equality by delegating to their respective
+     * {@link Object#equals(Object)} methods.
+     *
+     * @param o the {@link androidx.core.util.Pair} to which this one is to be checked for equality
+     * @return true if the underlying objects of the Pair are both considered
+     * equal
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof androidx.core.util.Pair)) {
+            return false;
+        }
+        androidx.core.util.Pair<?, ?> p = (androidx.core.util.Pair<?, ?>) o;
+        return ObjectsCompat.equals(p.first, first) && ObjectsCompat.equals(p.second, second);
+    }
+
+    /**
+     * Compute a hash code using the hash codes of the underlying objects
+     *
+     * @return a hashcode of the Pair
+     */
+    @Override
+    public int hashCode() {
+        return first.hashCode() ^ second.hashCode();
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "Pair{" + first + " " + second + "}";
+    }
+
+    /**
+     * Convenience method for creating an appropriately typed pair.
+     *
+     * @param a the first object in the Pair
+     * @param b the second object in the pair
+     * @return a Pair that is templatized with the types of a and b
+     */
+    @NonNull
+    public static <A, B> androidx.core.util.Pair<A, B> create(@Nullable A a, @Nullable B b) {
+        return new androidx.core.util.Pair<A, B>(a, b);
+    }
+}
+
diff --git a/app/src/main/java/awais/instagrabber/utils/NumberUtils.java b/app/src/main/java/awais/instagrabber/utils/NumberUtils.java
index 947165e9..5ad9ceea 100644
--- a/app/src/main/java/awais/instagrabber/utils/NumberUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/NumberUtils.java
@@ -1,8 +1,9 @@
 package awais.instagrabber.utils;
 
 import androidx.annotation.NonNull;
-import androidx.core.util.Pair;
+import androidx.annotation.Nullable;
 
+import java.util.Locale;
 import java.util.Random;
 
 public final class NumberUtils {
@@ -56,7 +57,7 @@ public final class NumberUtils {
     }
 
     @NonNull
-    public static Pair<Integer, Integer> calculateWidthHeight(final int height, final int width, final int maxHeight, final int maxWidth) {
+    public static NullSafePair<Integer, Integer> calculateWidthHeight(final int height, final int width, final int maxHeight, final int maxWidth) {
         if (width > maxWidth) {
             int tempHeight = getResultingHeight(maxWidth, height, width);
             int tempWidth = maxWidth;
@@ -64,7 +65,7 @@ public final class NumberUtils {
                 tempWidth = getResultingWidth(maxHeight, tempHeight, tempWidth);
                 tempHeight = maxHeight;
             }
-            return new Pair<>(tempWidth, tempHeight);
+            return new NullSafePair<>(tempWidth, tempHeight);
         }
         if ((height < maxHeight && width < maxWidth) || (height > maxHeight)) {
             int tempWidth = getResultingWidth(maxHeight, height, width);
@@ -73,12 +74,76 @@ public final class NumberUtils {
                 tempHeight = getResultingHeight(maxWidth, tempHeight, tempWidth);
                 tempWidth = maxWidth;
             }
-            return new Pair<>(tempWidth, tempHeight);
+            return new NullSafePair<>(tempWidth, tempHeight);
         }
-        return new Pair<>(width, height);
+        return new NullSafePair<>(width, height);
     }
 
     public static float roundFloat2Decimals(final float value) {
         return ((int) ((value + (value >= 0 ? 1 : -1) * 0.005f) * 100)) / 100f;
     }
+
+    @NonNull
+    public static String abbreviate(final long number) {
+        return abbreviate(number, null);
+    }
+
+
+    @NonNull
+    public static String abbreviate(final long number, @Nullable final AbbreviateOptions options) {
+        // adapted from https://stackoverflow.com/a/9769590/1436766
+        int threshold = 1000;
+        boolean addSpace = false;
+        if (options != null) {
+            threshold = options.getThreshold();
+            addSpace = options.addSpaceBeforePrefix();
+        }
+        if (number < threshold) return "" + number;
+        int exp = (int) (Math.log(number) / Math.log(threshold));
+        return String.format(Locale.US,
+                             "%.1f%s%c",
+                             number / Math.pow(threshold, exp),
+                             addSpace ? " " : "",
+                             "kMGTPE".charAt(exp - 1));
+    }
+
+    public static final class AbbreviateOptions {
+        private final int threshold;
+        private final boolean addSpaceBeforePrefix;
+
+        public static final class Builder {
+
+            private int threshold = 1000;
+            private boolean addSpaceBeforePrefix = false;
+
+            public Builder setThreshold(final int threshold) {
+                this.threshold = threshold;
+                return this;
+            }
+
+            public Builder setAddSpaceBeforePrefix(final boolean addSpaceBeforePrefix) {
+                this.addSpaceBeforePrefix = addSpaceBeforePrefix;
+                return this;
+            }
+
+            @NonNull
+            public AbbreviateOptions build() {
+                return new AbbreviateOptions(threshold, addSpaceBeforePrefix);
+            }
+
+        }
+
+        private AbbreviateOptions(final int threshold, final boolean addSpaceBeforePrefix) {
+            this.threshold = threshold;
+            this.addSpaceBeforePrefix = addSpaceBeforePrefix;
+        }
+
+        public int getThreshold() {
+            return threshold;
+        }
+
+        public boolean addSpaceBeforePrefix() {
+            return addSpaceBeforePrefix;
+        }
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/utils/ProcessPhoenix.java b/app/src/main/java/awais/instagrabber/utils/ProcessPhoenix.java
new file mode 100644
index 00000000..5dcc6e19
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/utils/ProcessPhoenix.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2014 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package awais.instagrabber.utils;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Process;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+/**
+ * Process Phoenix facilitates restarting your application process. This should only be used for
+ * things like fundamental state changes in your debug builds (e.g., changing from staging to
+ * production).
+ * <p>
+ * Trigger process recreation by calling {@link #triggerRebirth} with a {@link Context} instance.
+ */
+public final class ProcessPhoenix extends Activity {
+    private static final String KEY_RESTART_INTENTS = "phoenix_restart_intents";
+
+    /**
+     * Call to restart the application process using the {@linkplain Intent#CATEGORY_DEFAULT default}
+     * activity as an intent.
+     * <p>
+     * Behavior of the current process after invoking this method is undefined.
+     */
+    public static void triggerRebirth(Context context) {
+        triggerRebirth(context, getRestartIntent(context));
+    }
+
+    /**
+     * Call to restart the application process using the specified intents.
+     * <p>
+     * Behavior of the current process after invoking this method is undefined.
+     */
+    public static void triggerRebirth(Context context, Intent... nextIntents) {
+        Intent intent = new Intent(context, ProcessPhoenix.class);
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK); // In case we are called with non-Activity context.
+        intent.putParcelableArrayListExtra(KEY_RESTART_INTENTS, new ArrayList<>(Arrays.asList(nextIntents)));
+        context.startActivity(intent);
+        if (context instanceof Activity) {
+            ((Activity) context).finish();
+        }
+        Runtime.getRuntime().exit(0); // Kill kill kill!
+    }
+
+    private static Intent getRestartIntent(Context context) {
+        String packageName = context.getPackageName();
+        Intent defaultIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
+        if (defaultIntent != null) {
+            defaultIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+            return defaultIntent;
+        }
+
+        throw new IllegalStateException("Unable to determine default activity for "
+                                                + packageName
+                                                + ". Does an activity specify the DEFAULT category in its intent filter?");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ArrayList<Intent> intents = getIntent().getParcelableArrayListExtra(KEY_RESTART_INTENTS);
+        startActivities(intents.toArray(new Intent[intents.size()]));
+        finish();
+        Runtime.getRuntime().exit(0); // Kill kill kill!
+    }
+
+    /**
+     * Checks if the current process is a temporary Phoenix Process.
+     * This can be used to avoid initialisation of unused resources or to prevent running code that
+     * is not multi-process ready.
+     *
+     * @return true if the current process is a temporary Phoenix Process
+     */
+    public static boolean isPhoenixProcess(Context context) {
+        int currentPid = Process.myPid();
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningAppProcessInfo> runningProcesses = manager.getRunningAppProcesses();
+        if (runningProcesses != null) {
+            for (ActivityManager.RunningAppProcessInfo processInfo : runningProcesses) {
+                if (processInfo.pid == currentPid && processInfo.processName.endsWith(":phoenix")) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
index 0d7acc16..b3968fdd 100644
--- a/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/ResponseBodyUtils.java
@@ -2,7 +2,6 @@ package awais.instagrabber.utils;
 
 import android.net.Uri;
 import android.util.Log;
-import android.util.Pair;
 
 import androidx.annotation.Nullable;
 
@@ -1042,7 +1041,7 @@ public final class ResponseBodyUtils {
                         tappableObject.getString("question"),
                         tappableObject.getString("emoji"),
                         tappableObject.getBoolean("viewer_can_vote"),
-                        tappableObject.getDouble("slider_vote_average"),
+                        tappableObject.optDouble("slider_vote_average"),
                         tappableObject.getInt("slider_vote_count"),
                         tappableObject.optDouble("viewer_vote")
                 ));
@@ -1094,7 +1093,6 @@ public final class ResponseBodyUtils {
         final List<MediaCandidate> sortedCandidates = candidates.stream()
                 .sorted((c1, c2) -> Integer.compare(c2.getWidth(), c1.getWidth()))
                 .collect(Collectors.toList());
-        if (sortedCandidates.size() == 1) return sortedCandidates.get(0).getUrl();
         final List<MediaCandidate> filteredCandidates = sortedCandidates.stream()
                 .filter(c ->
                         c.getWidth() <= media.getOriginalWidth()
@@ -1102,6 +1100,7 @@ public final class ResponseBodyUtils {
                                 && (isSquare || Integer.compare(c.getWidth(), c.getHeight()) != 0)
                 )
                 .collect(Collectors.toList());
+        if (filteredCandidates.size() == 0) return sortedCandidates.get(0).getUrl();
         final MediaCandidate candidate = filteredCandidates.get(0);
         if (candidate == null) return null;
         return candidate.getUrl();
diff --git a/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java b/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java
index 7b89597d..d98e6b37 100755
--- a/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java
+++ b/app/src/main/java/awais/instagrabber/utils/SettingsHelper.java
@@ -16,6 +16,7 @@ import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_D
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_DM_AUTO_REFRESH_FREQ_UNIT;
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_DM_NOTIFICATIONS;
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_SENTRY;
+import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_SHOWN_COUNT_TOOLTIP;
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_TAB_ORDER;
 import static awais.instagrabber.utils.Constants.APP_LANGUAGE;
 import static awais.instagrabber.utils.Constants.APP_THEME;
@@ -34,6 +35,7 @@ import static awais.instagrabber.utils.Constants.DATE_TIME_SELECTION;
 import static awais.instagrabber.utils.Constants.DEFAULT_TAB;
 import static awais.instagrabber.utils.Constants.DEVICE_UUID;
 import static awais.instagrabber.utils.Constants.DM_MARK_AS_SEEN;
+import static awais.instagrabber.utils.Constants.DOWNLOAD_PREPEND_USER_NAME;
 import static awais.instagrabber.utils.Constants.DOWNLOAD_USER_FOLDER;
 import static awais.instagrabber.utils.Constants.FLAG_SECURE;
 import static awais.instagrabber.utils.Constants.FOLDER_PATH;
@@ -42,6 +44,7 @@ import static awais.instagrabber.utils.Constants.HIDE_MUTED_REELS;
 import static awais.instagrabber.utils.Constants.KEYWORD_FILTERS;
 import static awais.instagrabber.utils.Constants.MARK_AS_SEEN;
 import static awais.instagrabber.utils.Constants.MUTED_VIDEOS;
+import static awais.instagrabber.utils.Constants.PLAY_IN_BACKGROUND;
 import static awais.instagrabber.utils.Constants.PREF_DARK_THEME;
 import static awais.instagrabber.utils.Constants.PREF_EMOJI_VARIANTS;
 import static awais.instagrabber.utils.Constants.PREF_HASHTAG_POSTS_LAYOUT;
@@ -160,10 +163,10 @@ public final class SettingsHelper {
                     STORY_SORT, PREF_EMOJI_VARIANTS, PREF_REACTIONS, PREF_ENABLE_DM_AUTO_REFRESH_FREQ_UNIT, PREF_TAB_ORDER})
     public @interface StringSettings {}
 
-    @StringDef({DOWNLOAD_USER_FOLDER, FOLDER_SAVE_TO, AUTOPLAY_VIDEOS, SHOW_QUICK_ACCESS_DIALOG, MUTED_VIDEOS,
+    @StringDef({DOWNLOAD_USER_FOLDER, DOWNLOAD_PREPEND_USER_NAME, FOLDER_SAVE_TO, AUTOPLAY_VIDEOS, SHOW_QUICK_ACCESS_DIALOG, MUTED_VIDEOS,
                        SHOW_CAPTIONS, CUSTOM_DATE_TIME_FORMAT_ENABLED, MARK_AS_SEEN, DM_MARK_AS_SEEN, CHECK_ACTIVITY,
                        CHECK_UPDATES, SWAP_DATE_TIME_FORMAT_ENABLED, PREF_ENABLE_DM_NOTIFICATIONS, PREF_ENABLE_DM_AUTO_REFRESH,
-                       FLAG_SECURE, TOGGLE_KEYWORD_FILTER, PREF_ENABLE_SENTRY, HIDE_MUTED_REELS})
+                       FLAG_SECURE, TOGGLE_KEYWORD_FILTER, PREF_ENABLE_SENTRY, HIDE_MUTED_REELS, PLAY_IN_BACKGROUND, PREF_SHOWN_COUNT_TOOLTIP})
     public @interface BooleanSettings {}
 
     @StringDef({PREV_INSTALL_VERSION, BROWSER_UA_CODE, APP_UA_CODE, PREF_ENABLE_DM_AUTO_REFRESH_FREQ_NUMBER})
diff --git a/app/src/main/java/awais/instagrabber/utils/UserAgentUtils.java b/app/src/main/java/awais/instagrabber/utils/UserAgentUtils.java
index f3c0bd1b..45895c17 100644
--- a/app/src/main/java/awais/instagrabber/utils/UserAgentUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/UserAgentUtils.java
@@ -23,54 +23,54 @@ public class UserAgentUtils {
     // you can pick *any* device as long as you LEAVE OUT the resolution for maximum download quality
     public static final String[] devices = {
             // https://github.com/dilame/instagram-private-api/blob/master/src/samples/devices.json
-            "25/7.1.1; 440dpi; Xiaomi; Mi Note 3; jason; qcom",
-            "23/6.0.1; 480dpi; Xiaomi; Redmi Note 3; kenzo; qcom",
-            "23/6.0; 480dpi; Xiaomi; Redmi Note 4; nikel; mt6797",
-            "24/7.0; 480dpi; Xiaomi/xiaomi; Redmi Note 4; mido; qcom",
-            "23/6.0; 480dpi; Xiaomi; Redmi Note 4X; nikel; mt6797",
-            "27/8.1.0; 440dpi; Xiaomi/xiaomi; Redmi Note 5; whyred; qcom",
-            "23/6.0.1; 480dpi; Xiaomi; Redmi 4; markw; qcom",
-            "27/8.1.0; 440dpi; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
-            "25/7.1.2; 440dpi; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
-            "26/8.0.0; 480dpi; Xiaomi; MI 5; gemini; qcom",
-            "27/8.1.0; 480dpi; Xiaomi/xiaomi; Mi A1; tissot_sprout; qcom",
-            "26/8.0.0; 480dpi; Xiaomi; MI 6; sagit; qcom",
-            "25/7.1.1; 440dpi; Xiaomi; MI MAX 2; oxygen; qcom",
-            "24/7.0; 480dpi; Xiaomi; MI 5s; capricorn; qcom",
-            "26/8.0.0; 480dpi; samsung; SM-A520F; a5y17lte; samsungexynos7880",
-            "26/8.0.0; 480dpi; samsung; SM-G950F; dreamlte; samsungexynos8895",
-            "26/8.0.0; 640dpi; samsung; SM-G950F; dreamlte; samsungexynos8895",
-            "26/8.0.0; 420dpi; samsung; SM-G955F; dream2lte; samsungexynos8895",
-            "26/8.0.0; 560dpi; samsung; SM-G955F; dream2lte; samsungexynos8895",
-            "24/7.0; 480dpi; samsung; SM-A510F; a5xelte; samsungexynos7580",
-            "26/8.0.0; 480dpi; samsung; SM-G930F; herolte; samsungexynos8890",
-            "26/8.0.0; 480dpi; samsung; SM-G935F; hero2lte; samsungexynos8890",
-            "26/8.0.0; 420dpi; samsung; SM-G965F; star2lte; samsungexynos9810",
-            "26/8.0.0; 480dpi; samsung; SM-A530F; jackpotlte; samsungexynos7885",
-            "24/7.0; 640dpi; samsung; SM-G925F; zerolte; samsungexynos7420",
-            "26/8.0.0; 420dpi; samsung; SM-A720F; a7y17lte; samsungexynos7880",
-            "24/7.0; 640dpi; samsung; SM-G920F; zeroflte; samsungexynos7420",
-            "24/7.0; 420dpi; samsung; SM-J730FM; j7y17lte; samsungexynos7870",
-            "26/8.0.0; 480dpi; samsung; SM-G960F; starlte; samsungexynos9810",
-            "26/8.0.0; 420dpi; samsung; SM-N950F; greatlte; samsungexynos8895",
-            "26/8.0.0; 420dpi; samsung; SM-A730F; jackpot2lte; samsungexynos7885",
-            "26/8.0.0; 420dpi; samsung; SM-A605FN; a6plte; qcom",
-            "26/8.0.0; 480dpi; HUAWEI/HONOR; STF-L09; HWSTF; hi3660",
-            "27/8.1.0; 480dpi; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
-            "26/8.0.0; 480dpi; HUAWEI/HONOR; LLD-L31; HWLLD-H; hi6250",
-            "26/8.0.0; 480dpi; HUAWEI; ANE-LX1; HWANE; hi6250",
-            "26/8.0.0; 480dpi; HUAWEI; FIG-LX1; HWFIG-H; hi6250",
-            "27/8.1.0; 480dpi; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
-            "26/8.0.0; 480dpi; HUAWEI/HONOR; BND-L21; HWBND-H; hi6250",
-            "23/6.0.1; 420dpi; LeMobile/LeEco; Le X527; le_s2_ww; qcom",
+            "25/7.1.1; 440dpi; 2880x5884; Xiaomi; Mi Note 3; jason; qcom",
+            "23/6.0.1; 480dpi; 2880x5884; Xiaomi; Redmi Note 3; kenzo; qcom",
+            "23/6.0; 480dpi; 2880x5884; Xiaomi; Redmi Note 4; nikel; mt6797",
+            "24/7.0; 480dpi; 2880x5884; Xiaomi/xiaomi; Redmi Note 4; mido; qcom",
+            "23/6.0; 480dpi; 2880x5884; Xiaomi; Redmi Note 4X; nikel; mt6797",
+            "27/8.1.0; 440dpi; 2880x5884; Xiaomi/xiaomi; Redmi Note 5; whyred; qcom",
+            "23/6.0.1; 480dpi; 2880x5884; Xiaomi; Redmi 4; markw; qcom",
+            "27/8.1.0; 440dpi; 2880x5884; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
+            "25/7.1.2; 440dpi; 2880x5884; Xiaomi/xiaomi; Redmi 5 Plus; vince; qcom",
+            "26/8.0.0; 480dpi; 2880x5884; Xiaomi; MI 5; gemini; qcom",
+            "27/8.1.0; 480dpi; 2880x5884; Xiaomi/xiaomi; Mi A1; tissot_sprout; qcom",
+            "26/8.0.0; 480dpi; 2880x5884; Xiaomi; MI 6; sagit; qcom",
+            "25/7.1.1; 440dpi; 2880x5884; Xiaomi; MI MAX 2; oxygen; qcom",
+            "24/7.0; 480dpi; 2880x5884; Xiaomi; MI 5s; capricorn; qcom",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-A520F; a5y17lte; samsungexynos7880",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-G950F; dreamlte; samsungexynos8895",
+            "26/8.0.0; 640dpi; 2880x5884; samsung; SM-G950F; dreamlte; samsungexynos8895",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-G955F; dream2lte; samsungexynos8895",
+            "26/8.0.0; 560dpi; 2880x5884; samsung; SM-G955F; dream2lte; samsungexynos8895",
+            "24/7.0; 480dpi; 2880x5884; samsung; SM-A510F; a5xelte; samsungexynos7580",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-G930F; herolte; samsungexynos8890",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-G935F; hero2lte; samsungexynos8890",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-G965F; star2lte; samsungexynos9810",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-A530F; jackpotlte; samsungexynos7885",
+            "24/7.0; 640dpi; 2880x5884; samsung; SM-G925F; zerolte; samsungexynos7420",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-A720F; a7y17lte; samsungexynos7880",
+            "24/7.0; 640dpi; 2880x5884; samsung; SM-G920F; zeroflte; samsungexynos7420",
+            "24/7.0; 420dpi; 2880x5884; samsung; SM-J730FM; j7y17lte; samsungexynos7870",
+            "26/8.0.0; 480dpi; 2880x5884; samsung; SM-G960F; starlte; samsungexynos9810",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-N950F; greatlte; samsungexynos8895",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-A730F; jackpot2lte; samsungexynos7885",
+            "26/8.0.0; 420dpi; 2880x5884; samsung; SM-A605FN; a6plte; qcom",
+            "26/8.0.0; 480dpi; 2880x5884; HUAWEI/HONOR; STF-L09; HWSTF; hi3660",
+            "27/8.1.0; 480dpi; 2880x5884; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
+            "26/8.0.0; 480dpi; 2880x5884; HUAWEI/HONOR; LLD-L31; HWLLD-H; hi6250",
+            "26/8.0.0; 480dpi; 2880x5884; HUAWEI; ANE-LX1; HWANE; hi6250",
+            "26/8.0.0; 480dpi; 2880x5884; HUAWEI; FIG-LX1; HWFIG-H; hi6250",
+            "27/8.1.0; 480dpi; 2880x5884; HUAWEI/HONOR; COL-L29; HWCOL; kirin970",
+            "26/8.0.0; 480dpi; 2880x5884; HUAWEI/HONOR; BND-L21; HWBND-H; hi6250",
+            "23/6.0.1; 420dpi; 2880x5884; LeMobile/LeEco; Le X527; le_s2_ww; qcom",
             // https://github.com/mimmi20/BrowserDetector/tree/master
-            "28/9; 560dpi; samsung; SM-N960F; crownlte; samsungexynos9810",
+            "28/9; 560dpi; 2880x5884; samsung; SM-N960F; crownlte; samsungexynos9810",
             // mgp25
-            "23/6.0.1; 640dpi; LGE/lge; RS988; h1; h1",
-            "24/7.0; 640dpi; HUAWEI; LON-L29; HWLON; hi3660",
-            "23/6.0.1; 640dpi; ZTE; ZTE A2017U; ailsa_ii; qcom",
-            "23/6.0.1; 640dpi; samsung; SM-G935F; hero2lte; samsungexynos8890",
-            "23/6.0.1; 640dpi; samsung; SM-G930F; herolte; samsungexynos8890"
+            "23/6.0.1; 640dpi; 2880x5884; LGE/lge; RS988; h1; h1",
+            "24/7.0; 640dpi; 2880x5884; HUAWEI; LON-L29; HWLON; hi3660",
+            "23/6.0.1; 640dpi; 2880x5884; ZTE; ZTE A2017U; ailsa_ii; qcom",
+            "23/6.0.1; 640dpi; 2880x5884; samsung; SM-G935F; hero2lte; samsungexynos8890",
+            "23/6.0.1; 640dpi; 2880x5884; samsung; SM-G930F; herolte; samsungexynos8890"
     };
 
     @NonNull
diff --git a/app/src/main/java/awais/instagrabber/utils/Utils.java b/app/src/main/java/awais/instagrabber/utils/Utils.java
index 6f711a45..a9424b33 100644
--- a/app/src/main/java/awais/instagrabber/utils/Utils.java
+++ b/app/src/main/java/awais/instagrabber/utils/Utils.java
@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.media.MediaScannerConnection;
@@ -22,6 +23,7 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
 import android.util.TypedValue;
+import android.view.Display;
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
@@ -88,13 +90,17 @@ public final class Utils {
     }
 
     public static void copyText(@NonNull final Context context, final CharSequence string) {
-        if (clipboardManager == null)
+        if (clipboardManager == null) {
             clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-
+        }
         int toastMessage = R.string.clipboard_error;
         if (clipboardManager != null) {
-            clipboardManager.setPrimaryClip(ClipData.newPlainText(context.getString(R.string.app_name), string));
-            toastMessage = R.string.clipboard_copied;
+            try {
+                clipboardManager.setPrimaryClip(ClipData.newPlainText(context.getString(R.string.app_name), string));
+                toastMessage = R.string.clipboard_copied;
+            } catch (Exception e) {
+                Log.e(TAG, "copyText: ", e);
+            }
         }
         Toast.makeText(context, toastMessage, Toast.LENGTH_SHORT).show();
     }
@@ -284,6 +290,18 @@ public final class Utils {
         return outValue.data;
     }
 
+    public static int getAttrValue(@NonNull final Context context, final int attr) {
+        final TypedValue outValue = new TypedValue();
+        context.getTheme().resolveAttribute(attr, outValue, true);
+        return outValue.data;
+    }
+
+    public static int getAttrResId(@NonNull final Context context, final int attr) {
+        final TypedValue outValue = new TypedValue();
+        context.getTheme().resolveAttribute(attr, outValue, true);
+        return outValue.resourceId;
+    }
+
     public static void transparentStatusBar(final Activity activity,
                                             final boolean enable,
                                             final boolean fullscreen) {
@@ -343,6 +361,18 @@ public final class Utils {
         );
     }
 
+    public static void showKeyboard(@NonNull final View view) {
+        final Context context = view.getContext();
+        if (context == null) return;
+        final InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm == null) return;
+        view.requestFocus();
+        final boolean shown = imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+        if (!shown) {
+            Log.e(TAG, "showKeyboard: System did not display the keyboard");
+        }
+    }
+
     public static void hideKeyboard(final View view) {
         if (view == null) return;
         final Context context = view.getContext();
@@ -495,4 +525,41 @@ public final class Utils {
         if (navRootString == null || tabOrderString == null) return false;
         return tabOrderString.contains(navRootString);
     }
+
+    @NonNull
+    public static Point getNavigationBarSize(@NonNull Context context) {
+        Point appUsableSize = getAppUsableScreenSize(context);
+        Point realScreenSize = getRealScreenSize(context);
+
+        // navigation bar on the right
+        if (appUsableSize.x < realScreenSize.x) {
+            return new Point(realScreenSize.x - appUsableSize.x, appUsableSize.y);
+        }
+
+        // navigation bar at the bottom
+        if (appUsableSize.y < realScreenSize.y) {
+            return new Point(appUsableSize.x, realScreenSize.y - appUsableSize.y);
+        }
+
+        // navigation bar is not present
+        return new Point();
+    }
+
+    @NonNull
+    public static Point getAppUsableScreenSize(@NonNull Context context) {
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        Point size = new Point();
+        display.getSize(size);
+        return size;
+    }
+
+    @NonNull
+    public static Point getRealScreenSize(@NonNull Context context) {
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        Point size = new Point();
+        display.getRealSize(size);
+        return size;
+    }
 }
diff --git a/app/src/main/java/awais/instagrabber/utils/emoji/EmojiParser.java b/app/src/main/java/awais/instagrabber/utils/emoji/EmojiParser.java
index ac584c34..4012688b 100644
--- a/app/src/main/java/awais/instagrabber/utils/emoji/EmojiParser.java
+++ b/app/src/main/java/awais/instagrabber/utils/emoji/EmojiParser.java
@@ -15,6 +15,7 @@ import java.io.InputStream;
 import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -77,7 +78,12 @@ public final class EmojiParser {
                                            .addAll(emoji.getVariants())
                                            .build()
                                            .stream())
-                                   .collect(Collectors.toMap(Emoji::getUnicode, Function.identity()));
+                                   .collect(Collectors.toMap(
+                                           Emoji::getUnicode,
+                                           Function.identity(),
+                                           (u, v) -> u,
+                                           LinkedHashMap::new
+                                   ));
         } catch (Exception e) {
             Log.e(TAG, "EmojiParser: ", e);
         }
diff --git a/app/src/main/java/awais/instagrabber/viewmodels/AppStateViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/AppStateViewModel.java
index ab1cbabb..5b5bb54e 100644
--- a/app/src/main/java/awais/instagrabber/viewmodels/AppStateViewModel.java
+++ b/app/src/main/java/awais/instagrabber/viewmodels/AppStateViewModel.java
@@ -4,12 +4,11 @@ import android.app.Application;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import awais.instagrabber.db.datasources.AccountDataSource;
-import awais.instagrabber.db.repositories.AccountRepository;
 import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
@@ -23,23 +22,22 @@ public class AppStateViewModel extends AndroidViewModel {
     private static final String TAG = AppStateViewModel.class.getSimpleName();
 
     private final String cookie;
-    private final boolean isLoggedIn;
     private final MutableLiveData<User> currentUser = new MutableLiveData<>();
 
-    private AccountRepository accountRepository;
     private UserService userService;
 
     public AppStateViewModel(@NonNull final Application application) {
         super(application);
         // Log.d(TAG, "AppStateViewModel: constructor");
         cookie = settingsHelper.getString(Constants.COOKIE);
-        isLoggedIn = !TextUtils.isEmpty(cookie) && CookieUtils.getUserIdFromCookie(cookie) > 0;
+        final boolean isLoggedIn = !TextUtils.isEmpty(cookie) && CookieUtils.getUserIdFromCookie(cookie) != 0;
         if (!isLoggedIn) return;
         userService = UserService.getInstance();
-        accountRepository = AccountRepository.getInstance(AccountDataSource.getInstance(application));
+        // final AccountRepository accountRepository = AccountRepository.getInstance(AccountDataSource.getInstance(application));
         fetchProfileDetails();
     }
 
+    @Nullable
     public User getCurrentUser() {
         return currentUser.getValue();
     }
@@ -50,6 +48,7 @@ public class AppStateViewModel extends AndroidViewModel {
 
     private void fetchProfileDetails() {
         final long uid = CookieUtils.getUserIdFromCookie(cookie);
+        if (userService == null) return;
         userService.getUserInfo(uid, new ServiceCallback<User>() {
             @Override
             public void onSuccess(final User user) {
diff --git a/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewModel.java
deleted file mode 100644
index 7b693ea0..00000000
--- a/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package awais.instagrabber.viewmodels;
-
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-import java.util.List;
-
-import awais.instagrabber.models.CommentModel;
-
-public class CommentsViewModel extends ViewModel {
-    private MutableLiveData<List<CommentModel>> list;
-
-    public MutableLiveData<List<CommentModel>> getList() {
-        if (list == null) {
-            list = new MutableLiveData<>();
-        }
-        return list;
-    }
-}
diff --git a/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewerViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewerViewModel.java
new file mode 100644
index 00000000..109b6fea
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/viewmodels/CommentsViewerViewModel.java
@@ -0,0 +1,447 @@
+package awais.instagrabber.viewmodels;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import com.google.common.collect.ImmutableList;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.OptionalInt;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import awais.instagrabber.R;
+import awais.instagrabber.models.Comment;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.repositories.responses.FriendshipStatus;
+import awais.instagrabber.repositories.responses.GraphQLCommentsFetchResponse;
+import awais.instagrabber.repositories.responses.User;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.CookieUtils;
+import awais.instagrabber.utils.Utils;
+import awais.instagrabber.webservices.GraphQLService;
+import awais.instagrabber.webservices.MediaService;
+import awais.instagrabber.webservices.ServiceCallback;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+import static awais.instagrabber.utils.Utils.settingsHelper;
+
+public class CommentsViewerViewModel extends ViewModel {
+    private static final String TAG = CommentsViewerViewModel.class.getSimpleName();
+
+    private final MutableLiveData<Boolean> isLoggedIn = new MutableLiveData<>(false);
+    private final MutableLiveData<Long> currentUserId = new MutableLiveData<>(0L);
+    private final MutableLiveData<Resource<List<Comment>>> rootList = new MutableLiveData<>();
+    private final MutableLiveData<Integer> rootCount = new MutableLiveData<>(0);
+    private final MutableLiveData<Resource<List<Comment>>> replyList = new MutableLiveData<>();
+    private final GraphQLService service;
+
+    private String shortCode;
+    private String postId;
+    private String rootCursor;
+    private boolean rootHasNext = true;
+    private Comment repliesParent;
+    private String repliesCursor;
+    private boolean repliesHasNext = true;
+    private final MediaService mediaService;
+    private List<Comment> prevReplies;
+    private String prevRepliesCursor;
+    private boolean prevRepliesHasNext = true;
+
+    public CommentsViewerViewModel() {
+        service = GraphQLService.getInstance();
+        final String cookie = settingsHelper.getString(Constants.COOKIE);
+        final String deviceUuid = Utils.settingsHelper.getString(Constants.DEVICE_UUID);
+        final String csrfToken = CookieUtils.getCsrfTokenFromCookie(cookie);
+        final long userIdFromCookie = CookieUtils.getUserIdFromCookie(cookie);
+        mediaService = MediaService.getInstance(deviceUuid, csrfToken, userIdFromCookie);
+    }
+
+    public void setCurrentUser(final User currentUser) {
+        isLoggedIn.postValue(currentUser != null);
+        currentUserId.postValue(currentUser == null ? 0 : currentUser.getPk());
+    }
+
+    public void setPostDetails(final String shortCode, final String postId, final long postUserId) {
+        this.shortCode = shortCode;
+        this.postId = postId;
+        fetchComments();
+    }
+
+    public LiveData<Boolean> isLoggedIn() {
+        return isLoggedIn;
+    }
+
+    public LiveData<Long> getCurrentUserId() {
+        return currentUserId;
+    }
+
+    @Nullable
+    public Comment getRepliesParent() {
+        return repliesParent;
+    }
+
+    public LiveData<Resource<List<Comment>>> getRootList() {
+        return rootList;
+    }
+
+    public LiveData<Resource<List<Comment>>> getReplyList() {
+        return replyList;
+    }
+
+    public LiveData<Integer> getRootCommentsCount() {
+        return rootCount;
+    }
+
+    public void fetchComments() {
+        if (shortCode == null) return;
+        fetchComments(shortCode, true);
+    }
+
+    public void fetchReplies() {
+        if (repliesParent == null) return;
+        fetchReplies(repliesParent.getId());
+    }
+
+    public void fetchReplies(@NonNull final String commentId) {
+        fetchComments(commentId, false);
+    }
+
+    public void fetchComments(@NonNull final String shortCodeOrCommentId,
+                              final boolean root) {
+        if (root) {
+            if (!rootHasNext) return;
+            rootList.postValue(Resource.loading(getPrevList(rootList)));
+        } else {
+            if (!repliesHasNext) return;
+            final List<Comment> list;
+            if (repliesParent != null && !Objects.equals(repliesParent.getId(), shortCodeOrCommentId)) {
+                repliesCursor = null;
+                repliesHasNext = false;
+                list = Collections.emptyList();
+            } else {
+                list = getPrevList(replyList);
+            }
+            replyList.postValue(Resource.loading(list));
+        }
+        final Call<String> request = service.fetchComments(shortCodeOrCommentId, root, root ? rootCursor : repliesCursor);
+        enqueueRequest(request, root, shortCodeOrCommentId, new ServiceCallback<GraphQLCommentsFetchResponse>() {
+            @Override
+            public void onSuccess(final GraphQLCommentsFetchResponse result) {
+                // Log.d(TAG, "onSuccess: " + result);
+                List<Comment> comments = result.getComments();
+                if (root) {
+                    if (rootCursor == null) {
+                        rootCount.postValue(result.getCount());
+                    }
+                    if (rootCursor != null) {
+                        comments = mergeList(rootList, comments);
+                    }
+                    rootCursor = result.getCursor();
+                    rootHasNext = result.hasNext();
+                    rootList.postValue(Resource.success(comments));
+                    return;
+                }
+                // Replies
+                if (repliesCursor == null) {
+                    // add parent to top of replies
+                    comments = ImmutableList.<Comment>builder()
+                            .add(repliesParent)
+                            .addAll(comments)
+                            .build();
+                }
+                if (repliesCursor != null) {
+                    comments = mergeList(replyList, comments);
+                }
+                repliesCursor = result.getCursor();
+                repliesHasNext = result.hasNext();
+                replyList.postValue(Resource.success(comments));
+
+            }
+
+            @Override
+            public void onFailure(final Throwable t) {
+                Log.e(TAG, "onFailure: ", t);
+                if (root) {
+                    rootList.postValue(Resource.error(t.getMessage(), getPrevList(rootList)));
+                    return;
+                }
+                replyList.postValue(Resource.error(t.getMessage(), getPrevList(replyList)));
+            }
+        });
+    }
+
+    private void enqueueRequest(@NonNull final Call<String> request,
+                                final boolean root,
+                                final String shortCodeOrCommentId,
+                                final ServiceCallback<GraphQLCommentsFetchResponse> callback) {
+        request.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(@NonNull final Call<String> call, @NonNull final Response<String> response) {
+                final String rawBody = response.body();
+                if (rawBody == null) {
+                    Log.e(TAG, "Error occurred while fetching gql comments of " + shortCodeOrCommentId);
+                    callback.onSuccess(null);
+                    return;
+                }
+                try {
+                    final JSONObject body = root ? new JSONObject(rawBody).getJSONObject("data")
+                                                                          .getJSONObject("shortcode_media")
+                                                                          .getJSONObject("edge_media_to_parent_comment")
+                                                 : new JSONObject(rawBody).getJSONObject("data")
+                                                                          .getJSONObject("comment")
+                                                                          .getJSONObject("edge_threaded_comments");
+                    final int count = body.optInt("count");
+                    final JSONObject pageInfo = body.getJSONObject("page_info");
+                    final boolean hasNextPage = pageInfo.getBoolean("has_next_page");
+                    final String endCursor = pageInfo.isNull("end_cursor") ? null : pageInfo.optString("end_cursor");
+                    final JSONArray commentsJsonArray = body.getJSONArray("edges");
+                    final ImmutableList.Builder<Comment> builder = ImmutableList.builder();
+                    for (int i = 0; i < commentsJsonArray.length(); i++) {
+                        final Comment commentModel = getComment(commentsJsonArray.getJSONObject(i).getJSONObject("node"), root);
+                        builder.add(commentModel);
+                    }
+                    callback.onSuccess(new GraphQLCommentsFetchResponse(count, endCursor, hasNextPage, builder.build()));
+                } catch (Exception e) {
+                    Log.e(TAG, "onResponse", e);
+                    callback.onFailure(e);
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull final Call<String> call, @NonNull final Throwable t) {
+                callback.onFailure(t);
+            }
+        });
+    }
+
+    @NonNull
+    private Comment getComment(@NonNull final JSONObject commentJsonObject, final boolean root) throws JSONException {
+        final JSONObject owner = commentJsonObject.getJSONObject("owner");
+        final User user = new User(
+                owner.optLong(Constants.EXTRAS_ID, 0),
+                owner.getString(Constants.EXTRAS_USERNAME),
+                null,
+                false,
+                owner.getString("profile_pic_url"),
+                null,
+                new FriendshipStatus(false, false, false, false, false, false, false, false, false, false),
+                owner.optBoolean("is_verified"),
+                false, false, false, false, null, null, 0, 0, 0, 0, null, null, 0, null, null, null, null,
+                null, null);
+        final JSONObject likedBy = commentJsonObject.optJSONObject("edge_liked_by");
+        final String commentId = commentJsonObject.getString("id");
+        final JSONObject childCommentsJsonObject = commentJsonObject.optJSONObject("edge_threaded_comments");
+        int replyCount = 0;
+        if (childCommentsJsonObject != null) {
+            replyCount = childCommentsJsonObject.optInt("count");
+        }
+        return new Comment(commentId,
+                           commentJsonObject.getString("text"),
+                           commentJsonObject.getLong("created_at"),
+                           likedBy != null ? likedBy.optLong("count", 0) : 0,
+                           commentJsonObject.getBoolean("viewer_has_liked"),
+                           user,
+                           replyCount,
+                           !root);
+    }
+
+    @NonNull
+    private List<Comment> getPrevList(@NonNull final LiveData<Resource<List<Comment>>> list) {
+        if (list.getValue() == null) return Collections.emptyList();
+        final Resource<List<Comment>> listResource = list.getValue();
+        if (listResource.data == null) return Collections.emptyList();
+        return listResource.data;
+    }
+
+    private List<Comment> mergeList(@NonNull final LiveData<Resource<List<Comment>>> list,
+                                    final List<Comment> comments) {
+        final List<Comment> prevList = getPrevList(list);
+        if (comments == null) {
+            return prevList;
+        }
+        return ImmutableList.<Comment>builder()
+                .addAll(prevList)
+                .addAll(comments)
+                .build();
+    }
+
+    public void showReplies(final Comment comment) {
+        if (comment == null) return;
+        if (repliesParent == null || !Objects.equals(repliesParent.getId(), comment.getId())) {
+            repliesParent = comment;
+            prevReplies = null;
+            prevRepliesCursor = null;
+            prevRepliesHasNext = true;
+            fetchReplies(comment.getId());
+            return;
+        }
+        if (prevReplies != null && !prevReplies.isEmpty()) {
+            // user clicked same comment, show prev loaded replies
+            repliesCursor = prevRepliesCursor;
+            repliesHasNext = prevRepliesHasNext;
+            replyList.postValue(Resource.success(prevReplies));
+            return;
+        }
+        // prev list was null or empty, fetch
+        prevRepliesCursor = null;
+        prevRepliesHasNext = true;
+        fetchReplies(comment.getId());
+    }
+
+    public LiveData<Resource<Object>> likeComment(@NonNull final Comment comment, final boolean liked, final boolean isReply) {
+        final MutableLiveData<Resource<Object>> data = new MutableLiveData<>(Resource.loading(null));
+        final ServiceCallback<Boolean> callback = new ServiceCallback<Boolean>() {
+            @Override
+            public void onSuccess(final Boolean result) {
+                if (result == null || !result) {
+                    data.postValue(Resource.error(R.string.downloader_unknown_error, null));
+                    return;
+                }
+                data.postValue(Resource.success(new Object()));
+                setLiked(isReply, comment, liked);
+            }
+
+            @Override
+            public void onFailure(final Throwable t) {
+                Log.e(TAG, "Error liking comment", t);
+                data.postValue(Resource.error(t.getMessage(), null));
+            }
+        };
+        if (liked) {
+            mediaService.commentLike(comment.getId(), callback);
+        } else {
+            mediaService.commentUnlike(comment.getId(), callback);
+        }
+        return data;
+    }
+
+    private void setLiked(final boolean isReply,
+                          @NonNull final Comment comment,
+                          final boolean liked) {
+        final List<Comment> list = getPrevList(isReply ? replyList : rootList);
+        if (list == null) return;
+        final List<Comment> copy = new ArrayList<>(list);
+        OptionalInt indexOpt = IntStream.range(0, copy.size())
+                                        .filter(i -> copy.get(i) != null && Objects.equals(copy.get(i).getId(), comment.getId()))
+                                        .findFirst();
+        if (!indexOpt.isPresent()) return;
+        try {
+            final Comment clone = (Comment) comment.clone();
+            clone.setLiked(liked);
+            copy.set(indexOpt.getAsInt(), clone);
+            final MutableLiveData<Resource<List<Comment>>> liveData = isReply ? replyList : rootList;
+            liveData.postValue(Resource.success(copy));
+        } catch (Exception e) {
+            Log.e(TAG, "setLiked: ", e);
+        }
+    }
+
+    public LiveData<Resource<Object>> comment(@NonNull final String text,
+                                              final boolean isReply) {
+        final MutableLiveData<Resource<Object>> data = new MutableLiveData<>(Resource.loading(null));
+        String replyToId = null;
+        if (isReply && repliesParent != null) {
+            replyToId = repliesParent.getId();
+        }
+        if (isReply && replyToId == null) {
+            data.postValue(Resource.error(null, null));
+            return data;
+        }
+        mediaService.comment(postId, text, replyToId, new ServiceCallback<Comment>() {
+            @Override
+            public void onSuccess(final Comment result) {
+                if (result == null) {
+                    data.postValue(Resource.error(R.string.downloader_unknown_error, null));
+                    return;
+                }
+                addComment(result, isReply);
+                data.postValue(Resource.success(new Object()));
+            }
+
+            @Override
+            public void onFailure(final Throwable t) {
+                Log.e(TAG, "Error during comment", t);
+                data.postValue(Resource.error(t.getMessage(), null));
+            }
+        });
+        return data;
+    }
+
+    private void addComment(@NonNull final Comment comment, final boolean isReply) {
+        final List<Comment> list = getPrevList(isReply ? replyList : rootList);
+        final ImmutableList.Builder<Comment> builder = ImmutableList.builder();
+        if (isReply) {
+            // in a reply list the first comment is the parent comment
+            builder.add(list.get(0))
+                   .add(comment)
+                   .addAll(list.subList(1, list.size()));
+        } else {
+            builder.add(comment)
+                   .addAll(list);
+        }
+        final MutableLiveData<Resource<List<Comment>>> liveData = isReply ? replyList : rootList;
+        liveData.postValue(Resource.success(builder.build()));
+    }
+
+    public void translate(@NonNull final Comment comment,
+                          @NonNull final ServiceCallback<String> callback) {
+        mediaService.translate(comment.getId(), "2", callback);
+    }
+
+    public LiveData<Resource<Object>> deleteComment(@NonNull final Comment comment, final boolean isReply) {
+        final MutableLiveData<Resource<Object>> data = new MutableLiveData<>(Resource.loading(null));
+        mediaService.deleteComment(postId, comment.getId(), new ServiceCallback<Boolean>() {
+            @Override
+            public void onSuccess(final Boolean result) {
+                if (result == null || !result) {
+                    data.postValue(Resource.error(R.string.downloader_unknown_error, null));
+                    return;
+                }
+                removeComment(comment, isReply);
+                data.postValue(Resource.success(new Object()));
+            }
+
+            @Override
+            public void onFailure(final Throwable t) {
+                Log.e(TAG, "Error deleting comment", t);
+                data.postValue(Resource.error(t.getMessage(), null));
+            }
+        });
+        return data;
+    }
+
+    private void removeComment(@NonNull final Comment comment, final boolean isReply) {
+        final List<Comment> list = getPrevList(isReply ? replyList : rootList);
+        final List<Comment> updated = list.stream()
+                                          .filter(Objects::nonNull)
+                                          .filter(c -> !Objects.equals(c.getId(), comment.getId()))
+                                          .collect(Collectors.toList());
+        final MutableLiveData<Resource<List<Comment>>> liveData = isReply ? replyList : rootList;
+        liveData.postValue(Resource.success(updated));
+    }
+
+    public void clearReplies() {
+        prevRepliesCursor = repliesCursor;
+        prevRepliesHasNext = repliesHasNext;
+        repliesCursor = null;
+        repliesHasNext = true;
+        // cache prev reply list to save time and data if user clicks same comment again
+        prevReplies = getPrevList(replyList);
+        replyList.postValue(Resource.success(Collections.emptyList()));
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/viewmodels/GifPickerViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/GifPickerViewModel.java
index dd014204..69450281 100644
--- a/app/src/main/java/awais/instagrabber/viewmodels/GifPickerViewModel.java
+++ b/app/src/main/java/awais/instagrabber/viewmodels/GifPickerViewModel.java
@@ -13,12 +13,17 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import awais.instagrabber.R;
 import awais.instagrabber.models.Resource;
+import awais.instagrabber.repositories.responses.AnimatedMediaFixedHeight;
 import awais.instagrabber.repositories.responses.giphy.GiphyGif;
+import awais.instagrabber.repositories.responses.giphy.GiphyGifImages;
 import awais.instagrabber.repositories.responses.giphy.GiphyGifResponse;
 import awais.instagrabber.repositories.responses.giphy.GiphyGifResults;
+import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.webservices.GifService;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -92,12 +97,25 @@ public class GifPickerViewModel extends ViewModel {
         final GiphyGifResults results = giphyGifResponse.getResults();
         images.postValue(Resource.success(
                 ImmutableList.<GiphyGif>builder()
-                        .addAll(results.getGiphy() == null ? Collections.emptyList() : results.getGiphy())
-                        .addAll(results.getGiphyGifs() == null ? Collections.emptyList() : results.getGiphyGifs())
+                        .addAll(results.getGiphy() == null ? Collections.emptyList() : filterInvalid(results.getGiphy()))
+                        .addAll(results.getGiphyGifs() == null ? Collections.emptyList() : filterInvalid(results.getGiphyGifs()))
                         .build()
         ));
     }
 
+    private List<GiphyGif> filterInvalid(@NonNull final List<GiphyGif> giphyGifs) {
+        return giphyGifs.stream()
+                        .filter(Objects::nonNull)
+                        .filter(giphyGif -> {
+                            final GiphyGifImages images = giphyGif.getImages();
+                            if (images == null) return false;
+                            final AnimatedMediaFixedHeight fixedHeight = images.getFixedHeight();
+                            if (fixedHeight == null) return false;
+                            return !TextUtils.isEmpty(fixedHeight.getWebp());
+                        })
+                        .collect(Collectors.toList());
+    }
+
     // @NonNull
     // private List<GiphyGifImage> getGiphyGifImages(@NonNull final List<GiphyGif> giphy) {
     //     return giphy.stream()
diff --git a/app/src/main/java/awais/instagrabber/viewmodels/SearchFragmentViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/SearchFragmentViewModel.java
new file mode 100644
index 00000000..229cc9c1
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/viewmodels/SearchFragmentViewModel.java
@@ -0,0 +1,352 @@
+package awais.instagrabber.viewmodels;
+
+import android.app.Application;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import awais.instagrabber.db.datasources.FavoriteDataSource;
+import awais.instagrabber.db.datasources.RecentSearchDataSource;
+import awais.instagrabber.db.entities.Favorite;
+import awais.instagrabber.db.entities.RecentSearch;
+import awais.instagrabber.db.repositories.FavoriteRepository;
+import awais.instagrabber.db.repositories.RecentSearchRepository;
+import awais.instagrabber.db.repositories.RepositoryCallback;
+import awais.instagrabber.models.Resource;
+import awais.instagrabber.models.enums.FavoriteType;
+import awais.instagrabber.repositories.responses.search.SearchItem;
+import awais.instagrabber.repositories.responses.search.SearchResponse;
+import awais.instagrabber.utils.AppExecutors;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.CookieUtils;
+import awais.instagrabber.utils.Debouncer;
+import awais.instagrabber.utils.TextUtils;
+import awais.instagrabber.webservices.SearchService;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+import static androidx.lifecycle.Transformations.distinctUntilChanged;
+import static awais.instagrabber.utils.Utils.settingsHelper;
+
+public class SearchFragmentViewModel extends AppStateViewModel {
+    private static final String TAG = SearchFragmentViewModel.class.getSimpleName();
+    private static final String QUERY = "query";
+
+    private final MutableLiveData<String> query = new MutableLiveData<>();
+    private final MutableLiveData<Resource<List<SearchItem>>> topResults = new MutableLiveData<>();
+    private final MutableLiveData<Resource<List<SearchItem>>> userResults = new MutableLiveData<>();
+    private final MutableLiveData<Resource<List<SearchItem>>> hashtagResults = new MutableLiveData<>();
+    private final MutableLiveData<Resource<List<SearchItem>>> locationResults = new MutableLiveData<>();
+
+    private final SearchService searchService;
+    private final Debouncer<String> searchDebouncer;
+    private final boolean isLoggedIn;
+    private final LiveData<String> distinctQuery;
+    private final RecentSearchRepository recentSearchRepository;
+    private final FavoriteRepository favoriteRepository;
+
+    private String tempQuery;
+
+    public SearchFragmentViewModel(@NonNull final Application application) {
+        super(application);
+        final String cookie = settingsHelper.getString(Constants.COOKIE);
+        isLoggedIn = !TextUtils.isEmpty(cookie) && CookieUtils.getUserIdFromCookie(cookie) != 0;
+        final Debouncer.Callback<String> searchCallback = new Debouncer.Callback<String>() {
+            @Override
+            public void call(final String key) {
+                if (tempQuery == null) return;
+                query.postValue(tempQuery);
+            }
+
+            @Override
+            public void onError(final Throwable t) {
+                Log.e(TAG, "onError: ", t);
+            }
+        };
+        searchDebouncer = new Debouncer<>(searchCallback, 500);
+        distinctQuery = distinctUntilChanged(query);
+        searchService = SearchService.getInstance();
+        recentSearchRepository = RecentSearchRepository.getInstance(RecentSearchDataSource.getInstance(application));
+        favoriteRepository = FavoriteRepository.getInstance(FavoriteDataSource.getInstance(application));
+    }
+
+    public LiveData<String> getQuery() {
+        return distinctQuery;
+    }
+
+    public LiveData<Resource<List<SearchItem>>> getTopResults() {
+        return topResults;
+    }
+
+    public LiveData<Resource<List<SearchItem>>> getUserResults() {
+        return userResults;
+    }
+
+    public LiveData<Resource<List<SearchItem>>> getHashtagResults() {
+        return hashtagResults;
+    }
+
+    public LiveData<Resource<List<SearchItem>>> getLocationResults() {
+        return locationResults;
+    }
+
+    public void submitQuery(@Nullable final String query) {
+        String localQuery = query;
+        if (query == null) {
+            localQuery = "";
+        }
+        if (tempQuery != null && Objects.equals(localQuery.toLowerCase(), tempQuery.toLowerCase())) return;
+        tempQuery = query;
+        if (TextUtils.isEmpty(query)) {
+            // If empty immediately post it
+            searchDebouncer.cancel(QUERY);
+            this.query.postValue("");
+            return;
+        }
+        searchDebouncer.call(QUERY);
+    }
+
+    public void search(@NonNull final String query,
+                       @NonNull final FavoriteType type) {
+        final MutableLiveData<Resource<List<SearchItem>>> liveData = getLiveDataByType(type);
+        if (liveData == null) return;
+        if (TextUtils.isEmpty(query)) {
+            if (type != FavoriteType.TOP) {
+                liveData.postValue(Resource.success(Collections.emptyList()));
+                return;
+            }
+            showRecentSearchesAndFavorites();
+            return;
+        }
+        if (query.equals("@") || query.equals("#")) return;
+        final String c;
+        switch (type) {
+            case TOP:
+                c = "blended";
+                break;
+            case USER:
+                c = "user";
+                break;
+            case HASHTAG:
+                c = "hashtag";
+                break;
+            case LOCATION:
+                c = "place";
+                break;
+            default:
+                return;
+        }
+        liveData.postValue(Resource.loading(null));
+        final Call<SearchResponse> request = searchService.search(isLoggedIn, query, c);
+        request.enqueue(new Callback<SearchResponse>() {
+            @Override
+            public void onResponse(@NonNull final Call<SearchResponse> call,
+                                   @NonNull final Response<SearchResponse> response) {
+                if (!response.isSuccessful()) {
+                    sendErrorResponse(type);
+                    return;
+                }
+                final SearchResponse body = response.body();
+                if (body == null) {
+                    sendErrorResponse(type);
+                    return;
+                }
+                parseResponse(body, type);
+            }
+
+            @Override
+            public void onFailure(@NonNull final Call<SearchResponse> call,
+                                  @NonNull final Throwable t) {
+                Log.e(TAG, "onFailure: ", t);
+            }
+        });
+    }
+
+    private void showRecentSearchesAndFavorites() {
+        final SettableFuture<List<RecentSearch>> recentResultsFuture = SettableFuture.create();
+        final SettableFuture<List<Favorite>> favoritesFuture = SettableFuture.create();
+        recentSearchRepository.getAllRecentSearches(new RepositoryCallback<List<RecentSearch>>() {
+            @Override
+            public void onSuccess(final List<RecentSearch> result) {
+                recentResultsFuture.set(result);
+            }
+
+            @Override
+            public void onDataNotAvailable() {
+                recentResultsFuture.set(Collections.emptyList());
+            }
+        });
+        favoriteRepository.getAllFavorites(new RepositoryCallback<List<Favorite>>() {
+            @Override
+            public void onSuccess(final List<Favorite> result) {
+                favoritesFuture.set(result);
+            }
+
+            @Override
+            public void onDataNotAvailable() {
+                favoritesFuture.set(Collections.emptyList());
+            }
+        });
+        //noinspection UnstableApiUsage
+        final ListenableFuture<List<List<?>>> listenableFuture = Futures.allAsList(recentResultsFuture, favoritesFuture);
+        Futures.addCallback(listenableFuture, new FutureCallback<List<List<?>>>() {
+            @Override
+            public void onSuccess(@Nullable final List<List<?>> result) {
+                if (!TextUtils.isEmpty(tempQuery)) return; // Make sure user has not entered anything before updating results
+                if (result == null) {
+                    topResults.postValue(Resource.success(Collections.emptyList()));
+                    return;
+                }
+                try {
+                    //noinspection unchecked
+                    topResults.postValue(Resource.success(
+                            ImmutableList.<SearchItem>builder()
+                                    .addAll(SearchItem.fromRecentSearch((List<RecentSearch>) result.get(0)))
+                                    .addAll(SearchItem.fromFavorite((List<Favorite>) result.get(1)))
+                                    .build()
+                    ));
+                } catch (Exception e) {
+                    Log.e(TAG, "onSuccess: ", e);
+                    topResults.postValue(Resource.success(Collections.emptyList()));
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull final Throwable t) {
+                if (!TextUtils.isEmpty(tempQuery)) return;
+                topResults.postValue(Resource.success(Collections.emptyList()));
+                Log.e(TAG, "onFailure: ", t);
+            }
+        }, AppExecutors.getInstance().mainThread());
+    }
+
+    private void sendErrorResponse(@NonNull final FavoriteType type) {
+        final MutableLiveData<Resource<List<SearchItem>>> liveData = getLiveDataByType(type);
+        if (liveData == null) return;
+        liveData.postValue(Resource.error(null, Collections.emptyList()));
+    }
+
+    private MutableLiveData<Resource<List<SearchItem>>> getLiveDataByType(@NonNull final FavoriteType type) {
+        final MutableLiveData<Resource<List<SearchItem>>> liveData;
+        switch (type) {
+            case TOP:
+                liveData = topResults;
+                break;
+            case USER:
+                liveData = userResults;
+                break;
+            case HASHTAG:
+                liveData = hashtagResults;
+                break;
+            case LOCATION:
+                liveData = locationResults;
+                break;
+            default:
+                return null;
+        }
+        return liveData;
+    }
+
+    private void parseResponse(@NonNull final SearchResponse body,
+                               @NonNull final FavoriteType type) {
+        final MutableLiveData<Resource<List<SearchItem>>> liveData = getLiveDataByType(type);
+        if (liveData == null) return;
+        if (isLoggedIn) {
+            if (body.getList() == null) {
+                liveData.postValue(Resource.success(Collections.emptyList()));
+                return;
+            }
+            if (type == FavoriteType.HASHTAG || type == FavoriteType.LOCATION) {
+                liveData.postValue(Resource.success(body.getList()
+                                                        .stream()
+                                                        .filter(i -> i.getUser() == null)
+                                                        .collect(Collectors.toList())));
+                return;
+            }
+            liveData.postValue(Resource.success(body.getList()));
+            return;
+        }
+
+        // anonymous
+        final List<SearchItem> list;
+        switch (type) {
+            case TOP:
+                list = ImmutableList
+                        .<SearchItem>builder()
+                        .addAll(body.getUsers())
+                        .addAll(body.getHashtags())
+                        .addAll(body.getPlaces())
+                        .build();
+                break;
+            case USER:
+                list = body.getUsers();
+                break;
+            case HASHTAG:
+                list = body.getHashtags();
+                break;
+            case LOCATION:
+                list = body.getPlaces();
+                break;
+            default:
+                return;
+        }
+        liveData.postValue(Resource.success(list));
+    }
+
+    public void saveToRecentSearches(final SearchItem searchItem) {
+        if (searchItem == null) return;
+        try {
+            final RecentSearch recentSearch = RecentSearch.fromSearchItem(searchItem);
+            if (recentSearch == null) return;
+            recentSearchRepository.insertOrUpdateRecentSearch(recentSearch, new RepositoryCallback<Void>() {
+                @Override
+                public void onSuccess(final Void result) {
+                    // Log.d(TAG, "onSuccess: inserted recent: " + recentSearch);
+                }
+
+                @Override
+                public void onDataNotAvailable() {}
+            });
+        } catch (Exception e) {
+            Log.e(TAG, "saveToRecentSearches: ", e);
+        }
+    }
+
+    @Nullable
+    public LiveData<Resource<Object>> deleteRecentSearch(final SearchItem searchItem) {
+        if (searchItem == null || !searchItem.isRecent()) return null;
+        final RecentSearch recentSearch = RecentSearch.fromSearchItem(searchItem);
+        if (recentSearch == null) return null;
+        final MutableLiveData<Resource<Object>> data = new MutableLiveData<>();
+        data.postValue(Resource.loading(null));
+        recentSearchRepository.deleteRecentSearchByIgIdAndType(recentSearch.getIgId(), recentSearch.getType(), new RepositoryCallback<Void>() {
+            @Override
+            public void onSuccess(final Void result) {
+                // Log.d(TAG, "onSuccess: deleted");
+                data.postValue(Resource.success(new Object()));
+            }
+
+            @Override
+            public void onDataNotAvailable() {
+                // Log.e(TAG, "onDataNotAvailable: not deleted");
+                data.postValue(Resource.error("Error deleting recent item", null));
+            }
+        });
+        return data;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/webservices/BaseService.java b/app/src/main/java/awais/instagrabber/webservices/BaseService.java
index e30aa992..a6cdf060 100644
--- a/app/src/main/java/awais/instagrabber/webservices/BaseService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/BaseService.java
@@ -1,50 +1,8 @@
 package awais.instagrabber.webservices;
 
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import java.io.File;
-
-import awais.instagrabber.BuildConfig;
-import awais.instagrabber.repositories.responses.Caption;
-import awais.instagrabber.utils.Utils;
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
-import retrofit2.converter.scalars.ScalarsConverterFactory;
-
 public abstract class BaseService {
     private static final String TAG = "BaseService";
 
-    private Retrofit.Builder builder;
-    private final int cacheSize = 10 * 1024 * 1024; // 10 MB
-    private final Cache cache = new Cache(new File(Utils.cacheDir), cacheSize);
-
-    Retrofit.Builder getRetrofitBuilder() {
-        if (builder == null) {
-            final OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
-                    .addInterceptor(new AddCookiesInterceptor())
-                    .followRedirects(false)
-                    .followSslRedirects(false)
-                    .cache(cache);
-            if (BuildConfig.DEBUG) {
-                // clientBuilder.addInterceptor(new LoggingInterceptor());
-            }
-            final Gson gson = new GsonBuilder()
-                    .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                    .registerTypeAdapter(Caption.class, new Caption.CaptionDeserializer())
-                    .setLenient()
-                    .create();
-            builder = new Retrofit.Builder()
-                    .addConverterFactory(ScalarsConverterFactory.create())
-                    .addConverterFactory(GsonConverterFactory.create(gson))
-                    .client(clientBuilder.build());
-        }
-        return builder;
-    }
-
     // protected String userBreadcrumb(final int size) {
     //     final long term = (random(2, 4) * 1000) + size + (random(15, 21) * 1000);
     //     final float div = (float) size / random(2, 4);
diff --git a/app/src/main/java/awais/instagrabber/webservices/CollectionService.java b/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
index faafb6d0..e0c50dc2 100644
--- a/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/CollectionService.java
@@ -1,5 +1,7 @@
 package awais.instagrabber.webservices;
 
+import android.text.TextUtils;
+
 import androidx.annotation.NonNull;
 
 import java.util.HashMap;
@@ -14,7 +16,6 @@ import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class CollectionService extends BaseService {
     private static final String TAG = "ProfileService";
@@ -31,10 +32,9 @@ public class CollectionService extends BaseService {
         this.deviceUuid = deviceUuid;
         this.csrfToken = csrfToken;
         this.userId = userId;
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(CollectionRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(CollectionRepository.class);
     }
 
     public String getCsrfToken() {
@@ -66,10 +66,10 @@ public class CollectionService extends BaseService {
         form.put("module_name", "feed_saved_add_to_collection");
         final List<String> ids;
         ids = posts.stream()
-                .map(Media::getPk)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        form.put("added_media_ids", "[" + String.join(",", ids) + "]");
+                   .map(Media::getPk)
+                   .filter(Objects::nonNull)
+                   .collect(Collectors.toList());
+        form.put("added_media_ids", "[" + TextUtils.join(",", ids) + "]");
         changeCollection(collectionId, "edit", form, callback);
     }
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.java b/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.java
index 5e4afea5..0688c761 100644
--- a/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.java
@@ -41,7 +41,6 @@ import awais.instagrabber.repositories.responses.giphy.GiphyGif;
 import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
-import retrofit2.Retrofit;
 
 public class DirectMessagesService extends BaseService {
     private static final String TAG = "DiscoverService";
@@ -59,10 +58,9 @@ public class DirectMessagesService extends BaseService {
         this.csrfToken = csrfToken;
         this.userId = userId;
         this.deviceUuid = deviceUuid;
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(DirectMessagesRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(DirectMessagesRepository.class);
     }
 
     public String getCsrfToken() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java b/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
index 294a6a7d..880ae526 100644
--- a/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/DiscoverService.java
@@ -12,7 +12,6 @@ import awais.instagrabber.utils.TextUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class DiscoverService extends BaseService {
 
@@ -23,10 +22,9 @@ public class DiscoverService extends BaseService {
     private static DiscoverService instance;
 
     private DiscoverService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(DiscoverRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(DiscoverRepository.class);
     }
 
     public static DiscoverService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/FeedService.java b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
index 3b4baddd..3ed9e7b6 100644
--- a/app/src/main/java/awais/instagrabber/webservices/FeedService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/FeedService.java
@@ -22,7 +22,6 @@ import awais.instagrabber.utils.TextUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class FeedService extends BaseService {
     private static final String TAG = "FeedService";
@@ -32,10 +31,9 @@ public class FeedService extends BaseService {
     private static FeedService instance;
 
     private FeedService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(FeedRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(FeedRepository.class);
     }
 
     public static FeedService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java
index 7c5da8cf..ced49305 100644
--- a/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/FriendshipService.java
@@ -25,7 +25,6 @@ import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class FriendshipService extends BaseService {
     private static final String TAG = "FriendshipService";
@@ -42,10 +41,9 @@ public class FriendshipService extends BaseService {
         this.deviceUuid = deviceUuid;
         this.csrfToken = csrfToken;
         this.userId = userId;
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(FriendshipRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(FriendshipRepository.class);
     }
 
     public String getCsrfToken() {
@@ -168,8 +166,8 @@ public class FriendshipService extends BaseService {
         form.put("_uuid", deviceUuid);
         form.put(story ? "target_reel_author_id" : "target_posts_author_id", String.valueOf(targetUserId));
         final Call<FriendshipChangeResponse> request = repository.changeMute(unmute ?
-                                                                                "unmute_posts_or_story_from_follow" :
-                                                                                "mute_posts_or_story_from_follow",
+                                                                             "unmute_posts_or_story_from_follow" :
+                                                                             "mute_posts_or_story_from_follow",
                                                                              form);
         request.enqueue(new Callback<FriendshipChangeResponse>() {
             @Override
@@ -198,8 +196,8 @@ public class FriendshipService extends BaseService {
         if (maxId != null) queryMap.put("max_id", maxId);
         final Call<String> request = repository.getList(
                 targetUserId,
-                                                        follower ? "followers" : "following",
-                                                        queryMap);
+                follower ? "followers" : "following",
+                queryMap);
         request.enqueue(new Callback<String>() {
             @Override
             public void onResponse(@NonNull final Call<String> call, @NonNull final Response<String> response) {
diff --git a/app/src/main/java/awais/instagrabber/webservices/GifService.java b/app/src/main/java/awais/instagrabber/webservices/GifService.java
index 6485efd1..e783f689 100644
--- a/app/src/main/java/awais/instagrabber/webservices/GifService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/GifService.java
@@ -3,7 +3,6 @@ package awais.instagrabber.webservices;
 import awais.instagrabber.repositories.GifRepository;
 import awais.instagrabber.repositories.responses.giphy.GiphyGifResponse;
 import retrofit2.Call;
-import retrofit2.Retrofit;
 
 public class GifService extends BaseService {
 
@@ -12,10 +11,9 @@ public class GifService extends BaseService {
     private static GifService instance;
 
     private GifService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(GifRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(GifRepository.class);
     }
 
     public static GifService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
index b4ca9293..eef7af9a 100644
--- a/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/GraphQLService.java
@@ -4,6 +4,8 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
+import com.google.common.collect.ImmutableMap;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -29,7 +31,6 @@ import awais.instagrabber.utils.TextUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class GraphQLService extends BaseService {
     private static final String TAG = "GraphQLService";
@@ -40,10 +41,9 @@ public class GraphQLService extends BaseService {
     private static GraphQLService instance;
 
     private GraphQLService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://www.instagram.com")
-                .build();
-        repository = retrofit.create(GraphQLRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofitWeb()
+                                    .create(GraphQLRepository.class);
     }
 
     public static GraphQLService getInstance() {
@@ -292,6 +292,20 @@ public class GraphQLService extends BaseService {
         });
     }
 
+    public Call<String> fetchComments(final String shortCodeOrCommentId,
+                                      final boolean root,
+                                      final String cursor) {
+        final Map<String, String> queryMap = new HashMap<>();
+        queryMap.put("query_hash", root ? "bc3296d1ce80a24b1b6e40b1e72903f5" : "51fdd02b67508306ad4484ff574a0b62");
+        final Map<String, Object> variables = ImmutableMap.of(
+                root ? "shortcode" : "comment_id", shortCodeOrCommentId,
+                "first", 50,
+                "after", cursor == null ? "" : cursor
+        );
+        queryMap.put("variables", new JSONObject(variables).toString());
+        return repository.fetch(queryMap);
+    }
+
     public void fetchUser(final String username,
                           final ServiceCallback<User> callback) {
         final Call<String> request = repository.getUser(username);
@@ -307,7 +321,7 @@ public class GraphQLService extends BaseService {
                 try {
                     final JSONObject body = new JSONObject(rawBody);
                     final JSONObject userJson = body.getJSONObject("graphql")
-                            .getJSONObject(Constants.EXTRAS_USER);
+                                                    .getJSONObject(Constants.EXTRAS_USER);
 
                     boolean isPrivate = userJson.getBoolean("is_private");
                     final long id = userJson.optLong(Constants.EXTRAS_ID, 0);
diff --git a/app/src/main/java/awais/instagrabber/webservices/LocationService.java b/app/src/main/java/awais/instagrabber/webservices/LocationService.java
index 7b3648f4..aca6ef47 100644
--- a/app/src/main/java/awais/instagrabber/webservices/LocationService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/LocationService.java
@@ -13,7 +13,6 @@ import awais.instagrabber.utils.TextUtils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class LocationService extends BaseService {
     private static final String TAG = "LocationService";
@@ -23,10 +22,9 @@ public class LocationService extends BaseService {
     private static LocationService instance;
 
     private LocationService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(LocationRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(LocationRepository.class);
     }
 
     public static LocationService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/MediaService.java b/app/src/main/java/awais/instagrabber/webservices/MediaService.java
index e1990e87..8eac4b35 100644
--- a/app/src/main/java/awais/instagrabber/webservices/MediaService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/MediaService.java
@@ -1,12 +1,12 @@
 package awais.instagrabber.webservices;
 
-import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -18,6 +18,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 
+import awais.instagrabber.models.Comment;
 import awais.instagrabber.models.enums.MediaItemType;
 import awais.instagrabber.repositories.MediaRepository;
 import awais.instagrabber.repositories.requests.UploadFinishOptions;
@@ -27,11 +28,11 @@ import awais.instagrabber.repositories.responses.MediaInfoResponse;
 import awais.instagrabber.repositories.responses.User;
 import awais.instagrabber.utils.DateUtils;
 import awais.instagrabber.utils.MediaUploadHelper;
+import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class MediaService extends BaseService {
     private static final String TAG = "MediaService";
@@ -51,10 +52,9 @@ public class MediaService extends BaseService {
         this.deviceUuid = deviceUuid;
         this.csrfToken = csrfToken;
         this.userId = userId;
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(MediaRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(MediaRepository.class);
     }
 
     public String getCsrfToken() {
@@ -172,7 +172,7 @@ public class MediaService extends BaseService {
     public void comment(@NonNull final String mediaId,
                         @NonNull final String comment,
                         final String replyToCommentId,
-                        @NonNull final ServiceCallback<Boolean> callback) {
+                        @NonNull final ServiceCallback<Comment> callback) {
         final String module = "self_comments_v2";
         final Map<String, Object> form = new HashMap<>();
         // form.put("user_breadcrumb", userBreadcrumb(comment.length()));
@@ -193,15 +193,33 @@ public class MediaService extends BaseService {
                 final String body = response.body();
                 if (body == null) {
                     Log.e(TAG, "Error occurred while creating comment");
-                    callback.onSuccess(false);
+                    callback.onSuccess(null);
                     return;
                 }
                 try {
                     final JSONObject jsonObject = new JSONObject(body);
-                    final String status = jsonObject.optString("status");
-                    callback.onSuccess(status.equals("ok"));
-                } catch (JSONException e) {
-                    // Log.e(TAG, "Error parsing body", e);
+                    // final String status = jsonObject.optString("status");
+                    final JSONObject commentJsonObject = jsonObject.optJSONObject("comment");
+                    Comment comment = null;
+                    if (commentJsonObject != null) {
+                        final JSONObject userJsonObject = commentJsonObject.optJSONObject("user");
+                        if (userJsonObject != null) {
+                            final Gson gson = new Gson();
+                            final User user = gson.fromJson(userJsonObject.toString(), User.class);
+                            comment = new Comment(
+                                    commentJsonObject.optString("pk"),
+                                    commentJsonObject.optString("text"),
+                                    commentJsonObject.optLong("created_at"),
+                                    0,
+                                    false,
+                                    user,
+                                    0,
+                                    !TextUtils.isEmpty(replyToCommentId)
+                            );
+                        }
+                    }
+                    callback.onSuccess(comment);
+                } catch (Exception e) {
                     callback.onFailure(e);
                 }
             }
@@ -223,7 +241,7 @@ public class MediaService extends BaseService {
                                final List<String> commentIds,
                                @NonNull final ServiceCallback<Boolean> callback) {
         final Map<String, Object> form = new HashMap<>();
-        form.put("comment_ids_to_delete", TextUtils.join(",", commentIds));
+        form.put("comment_ids_to_delete", android.text.TextUtils.join(",", commentIds));
         form.put("_csrftoken", csrfToken);
         form.put("_uid", userId);
         form.put("_uuid", deviceUuid);
diff --git a/app/src/main/java/awais/instagrabber/webservices/NewsService.java b/app/src/main/java/awais/instagrabber/webservices/NewsService.java
index 63fede99..580e2c04 100644
--- a/app/src/main/java/awais/instagrabber/webservices/NewsService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/NewsService.java
@@ -22,7 +22,6 @@ import awais.instagrabber.utils.Constants;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class NewsService extends BaseService {
     private static final String TAG = "NewsService";
@@ -32,10 +31,9 @@ public class NewsService extends BaseService {
     private static NewsService instance;
 
     private NewsService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(NewsRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(NewsRepository.class);
     }
 
     public static NewsService getInstance() {
@@ -56,9 +54,11 @@ public class NewsService extends BaseService {
                     callback.onSuccess(null);
                     return;
                 }
-                final List<Notification> result = new ArrayList<>();
-                result.addAll(body.getNewStories());
-                result.addAll(body.getOldStories());
+                final List<Notification> result = new ArrayList<Notification>();
+                final List<Notification> newStories = body.getNewStories();
+                if (newStories != null) result.addAll(newStories);
+                final List<Notification> oldStories = body.getOldStories();
+                if (oldStories != null) result.addAll(oldStories);
                 callback.onSuccess(result);
             }
 
@@ -120,7 +120,8 @@ public class NewsService extends BaseService {
                     aymlUsers.addAll(oldSuggestions);
                 }
 
-                final List<Notification> newsItems = aymlUsers.stream()
+                final List<Notification> newsItems = aymlUsers
+                        .stream()
                         .map(i -> {
                             final User u = i.getUser();
                             return new Notification(
@@ -162,7 +163,9 @@ public class NewsService extends BaseService {
                     return;
                 }
 
-                final List<Notification> newsItems = body.getUsers().stream()
+                final List<Notification> newsItems = body
+                        .getUsers()
+                        .stream()
                         .map(u -> {
                             return new Notification(
                                     new NotificationArgs(
diff --git a/app/src/main/java/awais/instagrabber/webservices/ProfileService.java b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
index 65f787a6..cc8199fd 100644
--- a/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/ProfileService.java
@@ -23,7 +23,6 @@ import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class ProfileService extends BaseService {
     private static final String TAG = "ProfileService";
@@ -33,10 +32,9 @@ public class ProfileService extends BaseService {
     private static ProfileService instance;
 
     private ProfileService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(ProfileRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(ProfileRepository.class);
     }
 
     public static ProfileService getInstance() {
@@ -104,9 +102,9 @@ public class ProfileService extends BaseService {
                     posts = Collections.emptyList();
                 } else {
                     posts = items.stream()
-                            .map(WrappedMedia::getMedia)
-                            .filter(Objects::nonNull)
-                            .collect(Collectors.toList());
+                                 .map(WrappedMedia::getMedia)
+                                 .filter(Objects::nonNull)
+                                 .collect(Collectors.toList());
                 }
                 callback.onSuccess(new PostsFetchResponse(
                         posts,
diff --git a/app/src/main/java/awais/instagrabber/webservices/RetrofitFactory.java b/app/src/main/java/awais/instagrabber/webservices/RetrofitFactory.java
new file mode 100644
index 00000000..981f205e
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/webservices/RetrofitFactory.java
@@ -0,0 +1,97 @@
+package awais.instagrabber.webservices;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.io.File;
+
+import awais.instagrabber.BuildConfig;
+import awais.instagrabber.repositories.responses.Caption;
+import awais.instagrabber.utils.Utils;
+import awais.instagrabber.webservices.interceptors.AddCookiesInterceptor;
+import awais.instagrabber.webservices.interceptors.IgErrorsInterceptor;
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
+
+public final class RetrofitFactory {
+    private static final Object LOCK = new Object();
+
+    private static RetrofitFactory instance;
+
+    private final int cacheSize = 10 * 1024 * 1024; // 10 MB
+    private final Cache cache = new Cache(new File(Utils.cacheDir), cacheSize);
+
+    private IgErrorsInterceptor igErrorsInterceptor;
+    private Retrofit.Builder builder;
+    private Retrofit retrofit;
+    private Retrofit retrofitWeb;
+
+    public static RetrofitFactory getInstance() {
+        if (instance == null) {
+            synchronized (LOCK) {
+                if (instance == null) {
+                    instance = new RetrofitFactory();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private Retrofit.Builder getRetrofitBuilder() {
+        if (builder == null) {
+            igErrorsInterceptor = new IgErrorsInterceptor();
+            final OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder()
+                    .followRedirects(false)
+                    .followSslRedirects(false)
+                    .cache(cache);
+            if (BuildConfig.DEBUG) {
+                // clientBuilder.addInterceptor(new LoggingInterceptor());
+            }
+            clientBuilder.addInterceptor(new AddCookiesInterceptor())
+                         .addInterceptor(igErrorsInterceptor);
+            final Gson gson = new GsonBuilder()
+                    .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+                    .registerTypeAdapter(Caption.class, new Caption.CaptionDeserializer())
+                    .setLenient()
+                    .create();
+            builder = new Retrofit.Builder()
+                    .addConverterFactory(ScalarsConverterFactory.create())
+                    .addConverterFactory(GsonConverterFactory.create(gson))
+                    .client(clientBuilder.build());
+        }
+        return builder;
+    }
+
+    public Retrofit getRetrofit() {
+        if (retrofit == null) {
+            retrofit = getRetrofitBuilder()
+                    .baseUrl("https://i.instagram.com")
+                    .build();
+        }
+        return retrofit;
+    }
+
+    public Retrofit getRetrofitWeb() {
+        if (retrofitWeb == null) {
+            retrofitWeb = getRetrofitBuilder()
+                    .baseUrl("https://www.instagram.com")
+                    .build();
+        }
+        return retrofitWeb;
+    }
+
+    public void destroy() {
+        if (igErrorsInterceptor != null) {
+            igErrorsInterceptor.destroy();
+        }
+        igErrorsInterceptor = null;
+        retrofit = null;
+        retrofitWeb = null;
+        builder = null;
+        instance = null;
+    }
+}
diff --git a/app/src/main/java/awais/instagrabber/webservices/SearchService.java b/app/src/main/java/awais/instagrabber/webservices/SearchService.java
index c9efa68f..4144f85d 100644
--- a/app/src/main/java/awais/instagrabber/webservices/SearchService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/SearchService.java
@@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableMap;
 import awais.instagrabber.repositories.SearchRepository;
 import awais.instagrabber.repositories.responses.search.SearchResponse;
 import retrofit2.Call;
-import retrofit2.Retrofit;
 
 public class SearchService extends BaseService {
     private static final String TAG = "LocationService";
@@ -15,10 +14,9 @@ public class SearchService extends BaseService {
     private static SearchService instance;
 
     private SearchService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://www.instagram.com")
-                .build();
-        repository = retrofit.create(SearchRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofitWeb()
+                                    .create(SearchRepository.class);
     }
 
     public static SearchService getInstance() {
@@ -38,8 +36,8 @@ public class SearchService extends BaseService {
         builder.put("context", context);
         builder.put("count", "50");
         return repository.search(isLoggedIn
-                ? "https://i.instagram.com/api/v1/fbsearch/topsearch_flat/"
-                : "https://www.instagram.com/web/search/topsearch/",
-                builder.build());
+                                 ? "https://i.instagram.com/api/v1/fbsearch/topsearch_flat/"
+                                 : "https://www.instagram.com/web/search/topsearch/",
+                                 builder.build());
     }
 }
diff --git a/app/src/main/java/awais/instagrabber/webservices/StoriesService.java b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
index 5901ad7b..169f630a 100644
--- a/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/StoriesService.java
@@ -32,7 +32,6 @@ import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class StoriesService extends BaseService {
     private static final String TAG = "StoriesService";
@@ -50,10 +49,9 @@ public class StoriesService extends BaseService {
         this.csrfToken = csrfToken;
         this.userId = userId;
         this.deviceUuid = deviceUuid;
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(StoriesRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(StoriesRepository.class);
     }
 
     public String getCsrfToken() {
@@ -195,8 +193,7 @@ public class StoriesService extends BaseService {
                             node.getInt("media_count"),
                             false,
                             node.optBoolean("has_besties_media")));
-                }
-                catch (Exception e) {} // to cover promotional reels with non-long user pk's
+                } catch (Exception e) {} // to cover promotional reels with non-long user pk's
             }
             final JSONArray broadcasts = new JSONObject(body).getJSONArray("broadcasts");
             for (int i = 0; i < broadcasts.length(); ++i) {
@@ -373,7 +370,8 @@ public class StoriesService extends BaseService {
         final String url = buildUrl(options);
         final Call<String> userStoryCall = repository.getUserStory(url);
         final boolean isLocOrHashtag = options.getType() == StoryViewerOptions.Type.LOCATION || options.getType() == StoryViewerOptions.Type.HASHTAG;
-        final boolean isHighlight = options.getType() == StoryViewerOptions.Type.HIGHLIGHT || options.getType() == StoryViewerOptions.Type.STORY_ARCHIVE;
+        final boolean isHighlight = options.getType() == StoryViewerOptions.Type.HIGHLIGHT || options
+                .getType() == StoryViewerOptions.Type.STORY_ARCHIVE;
         userStoryCall.enqueue(new Callback<String>() {
             @Override
             public void onResponse(@NonNull final Call<String> call, @NonNull final Response<String> response) {
@@ -414,7 +412,7 @@ public class StoriesService extends BaseService {
                         callback.onSuccess(null);
                     }
                 } catch (JSONException e) {
-                    Log.e(TAG, "Error parsing string");
+                    Log.e(TAG, "Error parsing string", e);
                 }
             }
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/TagsService.java b/app/src/main/java/awais/instagrabber/webservices/TagsService.java
index 615d72af..276f0dc7 100644
--- a/app/src/main/java/awais/instagrabber/webservices/TagsService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/TagsService.java
@@ -21,7 +21,6 @@ import awais.instagrabber.utils.Utils;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class TagsService extends BaseService {
 
@@ -32,10 +31,9 @@ public class TagsService extends BaseService {
     private final TagsRepository repository;
 
     private TagsService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com/")
-                .build();
-        repository = retrofit.create(TagsRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(TagsRepository.class);
     }
 
     public static TagsService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/UserService.java b/app/src/main/java/awais/instagrabber/webservices/UserService.java
index 52bb064d..1266662f 100644
--- a/app/src/main/java/awais/instagrabber/webservices/UserService.java
+++ b/app/src/main/java/awais/instagrabber/webservices/UserService.java
@@ -12,7 +12,6 @@ import awais.instagrabber.repositories.responses.WrappedUser;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
 
 public class UserService extends BaseService {
     private static final String TAG = UserService.class.getSimpleName();
@@ -22,10 +21,9 @@ public class UserService extends BaseService {
     private static UserService instance;
 
     private UserService() {
-        final Retrofit retrofit = getRetrofitBuilder()
-                .baseUrl("https://i.instagram.com")
-                .build();
-        repository = retrofit.create(UserRepository.class);
+        repository = RetrofitFactory.getInstance()
+                                    .getRetrofit()
+                                    .create(UserRepository.class);
     }
 
     public static UserService getInstance() {
diff --git a/app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java b/app/src/main/java/awais/instagrabber/webservices/interceptors/AddCookiesInterceptor.java
similarity index 96%
rename from app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java
rename to app/src/main/java/awais/instagrabber/webservices/interceptors/AddCookiesInterceptor.java
index 3b5f709f..610b5f89 100644
--- a/app/src/main/java/awais/instagrabber/webservices/AddCookiesInterceptor.java
+++ b/app/src/main/java/awais/instagrabber/webservices/interceptors/AddCookiesInterceptor.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.webservices;
+package awais.instagrabber.webservices.interceptors;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/awais/instagrabber/webservices/interceptors/IgErrorsInterceptor.java b/app/src/main/java/awais/instagrabber/webservices/interceptors/IgErrorsInterceptor.java
new file mode 100644
index 00000000..b0fab4d2
--- /dev/null
+++ b/app/src/main/java/awais/instagrabber/webservices/interceptors/IgErrorsInterceptor.java
@@ -0,0 +1,144 @@
+package awais.instagrabber.webservices.interceptors;
+
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.FragmentManager;
+
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import awais.instagrabber.R;
+import awais.instagrabber.activities.MainActivity;
+import awais.instagrabber.dialogs.ConfirmDialogFragment;
+import awais.instagrabber.utils.AppExecutors;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.TextUtils;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class IgErrorsInterceptor implements Interceptor {
+    private static final String TAG = IgErrorsInterceptor.class.getSimpleName();
+
+    public IgErrorsInterceptor() { }
+
+    @NonNull
+    @Override
+    public Response intercept(@NonNull final Chain chain) throws IOException {
+        final Request request = chain.request();
+        final Response response = chain.proceed(request);
+        if (response.isSuccessful()) {
+            return response;
+        }
+        checkError(response);
+        return response;
+    }
+
+    private void checkError(@NonNull final Response response) {
+        final int errorCode = response.code();
+        switch (errorCode) {
+            case 429: // "429 Too Many Requests"
+                // ('Throttled by Instagram because of too many API requests.');
+                showErrorDialog(R.string.throttle_error);
+                return;
+            case 431: // "431 Request Header Fields Too Large"
+                // show dialog?
+                Log.e(TAG, "Network error: " + getMessage(errorCode, "The request start-line and/or headers are too large to process."));
+                return;
+            case 404:
+                showErrorDialog(R.string.not_found);
+                return;
+            case 302: // redirect
+                final String location = response.header("location");
+                if (location != null && location.equals("https://www.instagram.com/accounts/login/")) {
+                    // rate limited
+                    showErrorDialog(R.string.rate_limit);
+                }
+                return;
+        }
+        final ResponseBody body = response.body();
+        if (body == null) return;
+        try {
+            final String bodyString = body.string();
+            Log.d(TAG, "checkError: " + bodyString);
+            final JSONObject jsonObject = new JSONObject(bodyString);
+            String message = jsonObject.optString("message");
+            if (!TextUtils.isEmpty(message)) {
+                message = message.toLowerCase();
+                switch (message) {
+                    case "user_has_logged_out":
+                        showErrorDialog(R.string.account_logged_out);
+                        return;
+                    case "login_required":
+                        showErrorDialog(R.string.login_required);
+                        return;
+                    case "execution failure":
+                        showSnackbar(message);
+                        return;
+                    case "not authorized to view user": // Do we handle this in profile view fragment?
+                    case "challenge_required": // Since we make users login using browser, we should not be getting this error in api requests
+                    default:
+                        showSnackbar(message);
+                        Log.e(TAG, "checkError: " + bodyString);
+                        return;
+                }
+            }
+            final String errorType = jsonObject.optString("error_type");
+            if (TextUtils.isEmpty(errorType)) return;
+            if (errorType.equals("sentry_block")) {
+                showErrorDialog(R.string.sentry_block);
+                return;
+            }
+            if (errorType.equals("inactive user")) {
+                showErrorDialog(R.string.inactive_user);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "checkError: ", e);
+        }
+    }
+
+    private void showSnackbar(final String message) {
+        final MainActivity mainActivity = MainActivity.getInstance();
+        if (mainActivity == null) return;
+        // final View view = mainActivity.getRootView();
+        // if (view == null) return;
+        try {
+            AppExecutors.getInstance()
+                        .mainThread()
+                        .execute(() -> Toast.makeText(mainActivity.getApplicationContext(), message, Toast.LENGTH_LONG).show());
+        } catch (Exception e) {
+            Log.e(TAG, "showSnackbar: ", e);
+        }
+    }
+
+    @NonNull
+    private String getMessage(final int errorCode, final String message) {
+        return String.format("code: %s, internalMessage: %s", errorCode, message);
+    }
+
+    private void showErrorDialog(@StringRes final int messageResId) {
+        final MainActivity mainActivity = MainActivity.getInstance();
+        if (mainActivity == null) return;
+        final FragmentManager fragmentManager = mainActivity.getSupportFragmentManager();
+        if (fragmentManager.isStateSaved()) return;
+        if (messageResId == 0) return;
+        final ConfirmDialogFragment dialogFragment = ConfirmDialogFragment.newInstance(
+                Constants.GLOBAL_NETWORK_ERROR_DIALOG_REQUEST_CODE,
+                R.string.error,
+                messageResId,
+                R.string.ok,
+                0,
+                0
+        );
+        dialogFragment.show(fragmentManager, "network_error_dialog");
+    }
+
+    public void destroy() {
+        // mainActivity = null;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java b/app/src/main/java/awais/instagrabber/webservices/interceptors/LoggingInterceptor.java
similarity index 83%
rename from app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java
rename to app/src/main/java/awais/instagrabber/webservices/interceptors/LoggingInterceptor.java
index c9358a72..02d02ba4 100644
--- a/app/src/main/java/awais/instagrabber/webservices/LoggingInterceptor.java
+++ b/app/src/main/java/awais/instagrabber/webservices/interceptors/LoggingInterceptor.java
@@ -1,4 +1,4 @@
-package awais.instagrabber.webservices;
+package awais.instagrabber.webservices.interceptors;
 
 import android.util.Log;
 
@@ -12,7 +12,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-class LoggingInterceptor implements Interceptor {
+public class LoggingInterceptor implements Interceptor {
     private static final String TAG = "LoggingInterceptor";
 
     @NonNull
@@ -30,7 +30,11 @@ class LoggingInterceptor implements Interceptor {
         String content = "";
         if (body != null) {
             contentType = body.contentType();
-            content = body.string();
+            try {
+                content = body.string();
+            } catch (Exception e) {
+                Log.e(TAG, "intercept: ", e);
+            }
             Log.d(TAG, content);
         }
         final ResponseBody wrappedBody = ResponseBody.create(contentType, content);
diff --git a/app/src/main/java/awais/instagrabber/workers/DownloadWorker.java b/app/src/main/java/awais/instagrabber/workers/DownloadWorker.java
index b0dae625..09d61c25 100644
--- a/app/src/main/java/awais/instagrabber/workers/DownloadWorker.java
+++ b/app/src/main/java/awais/instagrabber/workers/DownloadWorker.java
@@ -6,7 +6,6 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
@@ -16,6 +15,7 @@ import android.os.Looper;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 import androidx.core.content.FileProvider;
@@ -33,7 +33,6 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Collection;
@@ -48,15 +47,15 @@ import java.util.concurrent.ExecutionException;
 import awais.instagrabber.BuildConfig;
 import awais.instagrabber.R;
 import awais.instagrabber.services.DeleteImageIntentService;
+import awais.instagrabber.utils.BitmapUtils;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.DownloadUtils;
 import awais.instagrabber.utils.TextUtils;
 import awais.instagrabber.utils.Utils;
-//import awaisomereport.LogCollector;
 
+import static awais.instagrabber.utils.BitmapUtils.THUMBNAIL_SIZE;
 import static awais.instagrabber.utils.Constants.DOWNLOAD_CHANNEL_ID;
 import static awais.instagrabber.utils.Constants.NOTIF_GROUP_NAME;
-//import static awais.instagrabber.utils.Utils.logCollector;
 
 public class DownloadWorker extends Worker {
     private static final String TAG = "DownloadWorker";
@@ -253,40 +252,7 @@ public class DownloadWorker extends Worker {
             MediaScannerConnection.scanFile(context, new String[]{file.getAbsolutePath()}, null, null);
             final Uri uri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file);
             final ContentResolver contentResolver = context.getContentResolver();
-            Bitmap bitmap = null;
-            final String mimeType = Utils.getMimeType(uri, contentResolver);
-            if (!TextUtils.isEmpty(mimeType)) {
-                if (mimeType.startsWith("image")) {
-                    try (final InputStream inputStream = contentResolver.openInputStream(uri)) {
-                        bitmap = BitmapFactory.decodeStream(inputStream);
-                    } catch (final Exception e) {
-//                        if (logCollector != null)
-//                            logCollector.appendException(e, LogCollector.LogFile.ASYNC_DOWNLOADER, "onPostExecute::bitmap_1");
-                        if (BuildConfig.DEBUG) Log.e(TAG, "", e);
-                    }
-                } else if (mimeType.startsWith("video")) {
-                    final MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-                    try {
-                        try {
-                            retriever.setDataSource(context, uri);
-                        } catch (final Exception e) {
-                            retriever.setDataSource(file.getAbsolutePath());
-                        }
-                        bitmap = retriever.getFrameAtTime();
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
-                            try {
-                                retriever.close();
-                            } catch (final Exception e) {
-//                                if (logCollector != null)
-//                                    logCollector.appendException(e, LogCollector.LogFile.ASYNC_DOWNLOADER, "onPostExecute::bitmap_2");
-                            }
-                    } catch (final Exception e) {
-                        if (BuildConfig.DEBUG) Log.e(TAG, "", e);
-//                        if (logCollector != null)
-//                            logCollector.appendException(e, LogCollector.LogFile.ASYNC_DOWNLOADER, "onPostExecute::bitmap_3");
-                    }
-                }
-            }
+            final Bitmap bitmap = getThumbnail(context, file, uri, contentResolver);
             final String downloadComplete = context.getString(R.string.downloader_complete);
             final Intent intent = new Intent(Intent.ACTION_VIEW, uri)
                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
@@ -351,6 +317,49 @@ public class DownloadWorker extends Worker {
         }
     }
 
+    @Nullable
+    private Bitmap getThumbnail(final Context context,
+                                final File file,
+                                final Uri uri,
+                                final ContentResolver contentResolver) {
+        final String mimeType = Utils.getMimeType(uri, contentResolver);
+        if (TextUtils.isEmpty(mimeType)) return null;
+        Bitmap bitmap = null;
+        if (mimeType.startsWith("image")) {
+            try {
+                final BitmapUtils.BitmapResult bitmapResult = BitmapUtils
+                        .getBitmapResult(context.getContentResolver(), uri, THUMBNAIL_SIZE, THUMBNAIL_SIZE, -1, true);
+                if (bitmapResult == null) return null;
+                bitmap = bitmapResult.bitmap;
+            } catch (final Exception e) {
+                Log.e(TAG, "", e);
+            }
+            return bitmap;
+        }
+        if (mimeType.startsWith("video")) {
+            try {
+                MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+                try {
+                    try {
+                        retriever.setDataSource(context, uri);
+                    } catch (final Exception e) {
+                        retriever.setDataSource(file.getAbsolutePath());
+                    }
+                    bitmap = retriever.getFrameAtTime();
+                } finally {
+                    try {
+                        retriever.release();
+                    } catch (Exception e) {
+                        Log.e(TAG, "getThumbnail: ", e);
+                    }
+                }
+            } catch (final Exception e) {
+                Log.e(TAG, "", e);
+            }
+        }
+        return bitmap;
+    }
+
     public static class DownloadRequest {
         private final Map<String, String> urlToFilePathMap;
 
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 00000000..5b01fc74
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="50%p"
+        android:toXDelta="0" />
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_left.xml b/app/src/main/res/anim/slide_left.xml
index fa86a927..8808e776 100644
--- a/app/src/main/res/anim/slide_left.xml
+++ b/app/src/main/res/anim/slide_left.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="300"
-        android:fromXDelta="100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="100%"
+    android:toXDelta="0%" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 00000000..964d042f
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0"
+        android:toXDelta="-50%p" />
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_right.xml b/app/src/main/res/anim/slide_right.xml
index d283f645..7c0373bc 100644
--- a/app/src/main/res/anim/slide_right.xml
+++ b/app/src/main/res/anim/slide_right.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <translate
-        android:duration="300"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="100%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0%"
+    android:toXDelta="100%" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/barinsta_logo.png b/app/src/main/res/drawable/barinsta_logo.png
index ade3e9ef..a8e153f0 100644
Binary files a/app/src/main/res/drawable/barinsta_logo.png and b/app/src/main/res/drawable/barinsta_logo.png differ
diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
index 69bc5089..35986396 100644
--- a/app/src/main/res/drawable/ic_bookmark.xml
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="#333333">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_hashtag.png b/app/src/main/res/drawable/ic_hashtag.png
index ce135fc0..786fa9b9 100644
Binary files a/app/src/main/res/drawable/ic_hashtag.png and b/app/src/main/res/drawable/ic_hashtag.png differ
diff --git a/app/src/main/res/drawable/ic_outline_comments_24.xml b/app/src/main/res/drawable/ic_outline_comments_24.xml
index fce13024..376f8df1 100644
--- a/app/src/main/res/drawable/ic_outline_comments_24.xml
+++ b/app/src/main/res/drawable/ic_outline_comments_24.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,17.17L18.83,16H4V4h16v13.17zM20,2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4V4c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9M10,16V19.08L13.08,16H20V4H4V16H10Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_round_arrow_back_24.xml b/app/src/main/res/drawable/ic_round_arrow_back_24.xml
new file mode 100644
index 00000000..26d33e0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_arrow_back_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_bookmark_border_24.xml b/app/src/main/res/drawable/ic_round_bookmark_border_24.xml
new file mode 100644
index 00000000..e0c532fe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_bookmark_border_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M17,3L7,3c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,6c0,-0.55 0.45,-1 1,-1h8c0.55,0 1,0.45 1,1v12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_edit_24.xml b/app/src/main/res/drawable/ic_round_edit_24.xml
new file mode 100644
index 00000000..1599eed8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_edit_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,17.46v3.04c0,0.28 0.22,0.5 0.5,0.5h3.04c0.13,0 0.26,-0.05 0.35,-0.15L17.81,9.94l-3.75,-3.75L3.15,17.1c-0.1,0.1 -0.15,0.22 -0.15,0.36zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_mode_comment_24.xml b/app/src/main/res/drawable/ic_round_mode_comment_24.xml
index 366bca72..81bbaf21 100644
--- a/app/src/main/res/drawable/ic_round_mode_comment_24.xml
+++ b/app/src/main/res/drawable/ic_round_mode_comment_24.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M22,4c0,-1.1 -0.9,-2 -2,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4V4z"/>
-</vector>
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000"
+        android:pathData="M9,22A1,1 0 0,1 8,21V18H4A2,2 0 0,1 2,16V4C2,2.89 2.9,2 4,2H20A2,2 0 0,1 22,4V16A2,2 0 0,1 20,18H13.9L10.2,21.71C10,21.9 9.75,22 9.5,22V22H9Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_oval_light.xml b/app/src/main/res/drawable/shape_oval_light.xml
index 48b0b708..194d0b34 100644
--- a/app/src/main/res/drawable/shape_oval_light.xml
+++ b/app/src/main/res/drawable/shape_oval_light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/black" />
+    <solid android:color="@android:color/transparent" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ec72e8a1..4043744f 100755
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -33,13 +33,5 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/refresh" />
-
-        <androidx.appcompat.widget.AppCompatCheckBox
-            android:id="@+id/desktop_mode"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"
-            android:text="@string/desktop_2fa" />
     </androidx.appcompat.widget.LinearLayoutCompat>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 97bcb0bb..1e46b341 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,10 +29,32 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorSurface"
+                android:background="?attr/toolbarColor"
                 app:layout_collapseMode="pin"
                 app:title="@string/app_name"
-                tools:menu="@menu/main_menu" />
+                tools:menu="@menu/main_menu">
+
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/search_input_layout"
+                    style="?searchInputStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    app:boxStrokeColor="@null"
+                    app:boxStrokeWidth="0dp"
+                    app:boxStrokeWidthFocused="0dp"
+                    app:endIconContentDescription="@string/clear"
+                    app:endIconDrawable="@drawable/ic_close_24"
+                    app:endIconMode="custom"
+                    app:hintEnabled="false"
+                    tools:visibility="visible">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/search" />
+                </com.google.android.material.textfield.TextInputLayout>
+            </com.google.android.material.appbar.MaterialToolbar>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/dialog_post_view.xml b/app/src/main/res/layout/dialog_post_view.xml
index b56dd31c..fa67ecdf 100644
--- a/app/src/main/res/layout/dialog_post_view.xml
+++ b/app/src/main/res/layout/dialog_post_view.xml
@@ -1,477 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black_a80">
+    android:background="?colorSurface"
+    tools:context=".fragments.PostViewV2Fragment">
 
-    <awais.instagrabber.customviews.drawee.DraggableZoomableDraweeView
-        android:id="@+id/post_image"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/content_root"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@null"
-        android:clickable="true"
-        android:focusable="true"
-        android:transitionName="post_image"
-        app:actualImageScaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:background="@mipmap/ic_launcher"
-        tools:visibility="visible" />
+        android:layout_height="wrap_content">
 
-    <include
-        android:id="@+id/video_post"
-        layout="@layout/layout_video_player_with_thumbnail"
-        android:visibility="gone" />
-
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/slider_parent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <View
-        android:id="@+id/top_bg"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@color/black_a80"
-        app:layout_constraintBottom_toBottomOf="@id/profile_pic"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <awais.instagrabber.customviews.ProfilePicView
-        android:id="@+id/profile_pic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="12dp"
-        android:transitionName="profile_pic"
-        app:layout_constraintBottom_toBottomOf="@id/top_bg"
-        app:layout_constraintEnd_toStartOf="@id/title"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/top_bg"
-        app:size="regular" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
-        android:textColor="@color/white"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@id/subtitle"
-        app:layout_constraintEnd_toStartOf="@id/options"
-        app:layout_constraintStart_toEndOf="@id/profile_pic"
-        app:layout_constraintTop_toTopOf="@id/profile_pic"
-        tools:text="Username Username Username" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/subtitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="@id/profile_pic"
-        app:layout_constraintEnd_toStartOf="@id/options"
-        app:layout_constraintStart_toStartOf="@id/title"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="Full name Full name Full name Full name Full name Full name Full name " />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/options"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/top_bg"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/top_bg"
-        app:srcCompat="@drawable/ic_more_vert_24"
-        app:tint="@color/white"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/user_details_group"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:constraint_referenced_ids="top_bg, profile_pic,title,subtitle,options"
-        tools:visibility="visible" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/media_counter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:background="@drawable/rounder_corner_semi_black_bg"
-        android:gravity="center"
-        android:padding="8dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        android:textColor="@android:color/white"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_bg"
-        tools:text="1/5"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/location"
-        style="?borderlessButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:elevation="0dp"
-        android:ellipsize="end"
-        android:insetTop="0dp"
-        android:insetBottom="0dp"
-        android:maxWidth="200dp"
-        android:maxLines="1"
-        android:minHeight="32dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:textAlignment="viewStart"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white"
-        android:visibility="gone"
-        app:backgroundTint="@color/black_a50"
-        app:elevation="0dp"
-        app:icon="@drawable/ic_round_location_on_24"
-        app:iconSize="16dp"
-        app:iconTint="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_bg"
-        app:rippleColor="@color/grey_600"
-        tools:text="Location, Location, Location, Location, "
-        tools:visibility="visible" />
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@null"
-        app:layout_constraintBottom_toBottomOf="@id/bottom_bg_barrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="gone">
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/caption_parent"
-            android:layout_width="match_parent"
+        <awais.instagrabber.customviews.ProfilePicView
+            android:id="@+id/profile_pic"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/black_a80"
-            app:behavior_hideable="true"
-            app:behavior_peekHeight="100dp"
-            app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+            android:layout_margin="12dp"
+            android:transitionName="profile_pic"
+            app:layout_constraintBottom_toTopOf="@id/top_barrier"
+            app:layout_constraintEnd_toStartOf="@id/title"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:size="regular" />
 
-            <ScrollView
-                android:id="@+id/bottom_scroll_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@null">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toTopOf="@id/subtitle"
+            app:layout_constraintEnd_toStartOf="@id/options"
+            app:layout_constraintStart_toEndOf="@id/profile_pic"
+            app:layout_constraintTop_toTopOf="@id/profile_pic"
+            tools:text="Username Username Username" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/subtitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+            app:layout_constraintBottom_toBottomOf="@id/profile_pic"
+            app:layout_constraintEnd_toStartOf="@id/options"
+            app:layout_constraintStart_toStartOf="@id/title"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            tools:text="Full name Full name Full name Full name Full name Full name Full name "
+            tools:visibility="gone" />
 
-                    <awais.instagrabber.customviews.RamboTextViewV2
-                        android:id="@+id/caption"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:background="@null"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:padding="16dp"
-                        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-                        android:textColor="@color/white"
-                        tools:text="Text text text" />
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/options"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@id/profile_pic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/profile_pic"
+            app:srcCompat="@drawable/ic_more_vert_24"
+            tools:visibility="visible" />
 
-                    <!--<androidx.appcompat.widget.AppCompatTextView-->
-                    <!--    android:id="@+id/editCaption"-->
-                    <!--    android:layout_width="match_parent"-->
-                    <!--    android:layout_height="wrap_content"-->
-                    <!--    android:layout_marginStart="16dp"-->
-                    <!--    android:layout_marginTop="8dp"-->
-                    <!--    android:background="@null"-->
-                    <!--    android:gravity="center_vertical"-->
-                    <!--    android:text="@string/edit_caption"-->
-                    <!--    android:textColor="?android:textColorSecondary"-->
-                    <!--    android:textSize="16sp"-->
-                    <!--    android:visibility="gone"-->
-                    <!--    app:layout_constraintBottom_toTopOf="@id/translatedCaption"-->
-                    <!--    app:layout_constraintTop_toBottomOf="@id/caption"-->
-                    <!--    tools:visibility="visible" />-->
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/top_barrier"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:barrierAllowsGoneWidgets="true"
+            app:barrierDirection="bottom" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/translate"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:gravity="center_vertical"
-                        android:paddingStart="16dp"
-                        android:paddingTop="8dp"
-                        android:paddingEnd="16dp"
-                        android:paddingBottom="8dp"
-                        android:text="@string/translate_caption"
-                        android:textColor="@color/blue_600"
-                        android:textSize="16sp"
-                        android:visibility="visible" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/media_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/rounder_corner_semi_black_bg"
+            android:gravity="center"
+            android:padding="8dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/profile_pic"
+            tools:text="1/5"
+            tools:visibility="visible" />
 
-                    <!--<awais.instagrabber.customviews.RamboTextViewV2-->
-                    <!--    android:id="@+id/translatedCaption"-->
-                    <!--    android:layout_width="match_parent"-->
-                    <!--    android:layout_height="wrap_content"-->
-                    <!--    android:layout_gravity="bottom"-->
-                    <!--    android:background="@null"-->
-                    <!--    android:clickable="true"-->
-                    <!--    android:focusable="true"-->
-                    <!--    android:padding="16dp"-->
-                    <!--    android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"-->
-                    <!--    android:textColor="@color/white"-->
-                    <!--    android:visibility="gone"-->
-                    <!--    app:layout_constraintBottom_toBottomOf="parent"-->
-                    <!--    app:layout_constraintTop_toBottomOf="@id/translateTitle"-->
-                    <!--    tools:text="Text text text"-->
-                    <!--    tools:visibility="visible" />-->
-                </LinearLayout>
-            </ScrollView>
-        </androidx.core.widget.NestedScrollView>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/location"
+            style="?borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:elevation="0dp"
+            android:ellipsize="end"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:maxWidth="200dp"
+            android:maxLines="1"
+            android:minHeight="32dp"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textAlignment="viewStart"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            app:backgroundTint="@color/black_a50"
+            app:elevation="0dp"
+            app:icon="@drawable/ic_round_location_on_24"
+            app:iconSize="16dp"
+            app:iconTint="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/profile_pic"
+            app:rippleColor="@color/grey_600"
+            tools:text="Location, Location, Location, Location, "
+            tools:visibility="visible" />
 
-    <include
-        android:id="@+id/player_controls"
-        layout="@layout/layout_exo_custom_controls"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/bottom_bg_barrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:visibility="gone" />
+        <include layout="@layout/layout_post_view_bottom" />
 
-    <View
-        android:id="@+id/bottom_bg"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@color/black_a80"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/bottom_bg_barrier" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/bottom_bg_barrier"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:barrierAllowsGoneWidgets="true"
-        app:barrierDirection="top"
-        app:constraint_referenced_ids="likes_count,comments_count,views_count" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/likes_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/counts_barrier"
-        app:layout_constraintEnd_toStartOf="@id/comments_count"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bottom_bg_barrier"
-        tools:text="9999999999 likes"
-        tools:visibility="gone" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/comments_count"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/counts_barrier"
-        app:layout_constraintEnd_toStartOf="@id/views_count"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/likes_count"
-        app:layout_constraintTop_toBottomOf="@id/bottom_bg_barrier"
-        tools:text="9999999 comments"
-        tools:visibility="gone" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/views_count"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/counts_barrier"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/comments_count"
-        app:layout_constraintTop_toBottomOf="@id/bottom_bg_barrier"
-        tools:text="9999999999 views"
-        tools:visibility="gone" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/counts_barrier"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:barrierAllowsGoneWidgets="true"
-        app:barrierDirection="top"
-        app:constraint_referenced_ids="date" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/date"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="@id/buttons_barrier"
-        app:layout_constraintTop_toBottomOf="@id/counts_barrier"
-        tools:text="2020-11-07 11:18:55"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/buttons_barrier"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierAllowsGoneWidgets="true"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="date" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/caption_toggle"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="@drawable/ic_notes_24"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/like"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/like"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="@drawable/ic_not_liked"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/comment"
-        app:layout_constraintStart_toEndOf="@id/caption_toggle"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/comment"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="@drawable/ic_outline_comments_24"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/player_controls_toggle"
-        app:layout_constraintStart_toEndOf="@id/like"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/player_controls_toggle"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="gone"
-        app:icon="@drawable/ic_play_circle_outline_24"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/save"
-        app:layout_constraintStart_toEndOf="@id/comment"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/save"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="@drawable/ic_outline_class_24"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/share"
-        app:layout_constraintStart_toEndOf="@id/player_controls_toggle"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/share"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="?attr/actionModeShareDrawable"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/download"
-        app:layout_constraintStart_toEndOf="@id/save"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/download"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:visibility="visible"
-        app:icon="@drawable/ic_download"
-        app:iconGravity="textStart"
-        app:iconPadding="0dp"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/share"
-        app:layout_constraintTop_toBottomOf="@id/buttons_barrier"
-        app:rippleColor="@color/grey_300"
-        tools:visibility="visible" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_collection_posts.xml b/app/src/main/res/layout/fragment_collection_posts.xml
index 4d82bbe3..fe8cef36 100644
--- a/app/src/main/res/layout/fragment_collection_posts.xml
+++ b/app/src/main/res/layout/fragment_collection_posts.xml
@@ -15,6 +15,7 @@
             android:id="@+id/collapsing_toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="?attr/toolbarColor"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <FrameLayout
@@ -39,6 +40,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:background="@null"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_comments.xml b/app/src/main/res/layout/fragment_comments.xml
index c88982c2..7485a223 100644
--- a/app/src/main/res/layout/fragment_comments.xml
+++ b/app/src/main/res/layout/fragment_comments.xml
@@ -1,47 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:background="?colorSurface">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/replies_container_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:elevation="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/swipe_refresh_layout"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        android:layout_width="match_parent"
+        android:id="@+id/swipe_refresh_layout"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="1">
+        app:layout_constraintBottom_toTopOf="@id/comment_field"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rvComments"
+            android:id="@+id/comments"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
             tools:listitem="@layout/item_comment" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <!--app:startIconDrawable="@drawable/ic_close_24"-->
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/commentField"
-        android:layout_width="match_parent"
+        android:id="@+id/comment_field"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="4dp"
         android:hint="@string/comment_hint"
         android:visibility="gone"
-        app:counterEnabled="true"
+        app:counterEnabled="false"
         app:counterMaxLength="2200"
         app:endIconDrawable="@drawable/ic_round_send_24"
         app:endIconMode="custom"
-        app:startIconDrawable="@drawable/ic_close_24">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/swipe_refresh_layout"
+        tools:visibility="visible">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/commentText"
+            android:id="@+id/comment_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:autofillHints="no"
             android:inputType="textMultiLine"
             android:maxLength="2200"
-            android:maxLines="10"
-            android:scrollHorizontally="false" />
+            android:scrollHorizontally="false"
+            tools:text="test" />
 
     </com.google.android.material.textfield.TextInputLayout>
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_discover.xml b/app/src/main/res/layout/fragment_discover.xml
index 6636e3bc..e18824c7 100644
--- a/app/src/main/res/layout/fragment_discover.xml
+++ b/app/src/main/res/layout/fragment_discover.xml
@@ -10,12 +10,15 @@
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/topics_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:clipToPadding="false"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:spanCount="2"
             tools:itemCount="10"
diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index 05a808d6..d437e6e7 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -4,4 +4,4 @@
     android:id="@+id/favorite_list"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:listitem="@layout/item_suggestion" />
\ No newline at end of file
+    tools:listitem="@layout/item_search_result" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index da5f341f..6cad7bc1 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    app:layoutDescription="@xml/header_list_scene">
 
-    <!--<com.google.android.material.appbar.AppBarLayout-->
-    <!--    android:id="@+id/stories_container"-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="wrap_content">-->
-
-    <!--    <com.google.android.material.appbar.CollapsingToolbarLayout-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        app:layout_scrollFlags="scroll|snap">-->
-
-    <!--<androidx.recyclerview.widget.RecyclerView-->
-    <!--    android:id="@+id/feed_stories_recycler_view"-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="wrap_content"-->
-    <!--    android:clipToPadding="false" />-->
-    <!--    </com.google.android.material.appbar.CollapsingToolbarLayout>-->
-    <!--</com.google.android.material.appbar.AppBarLayout>-->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/toolbarColor"
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@id/feed_swipe_refresh_layout"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/item_highlight" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/feed_swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header">
 
         <awais.instagrabber.customviews.PostsRecyclerView
             android:id="@+id/feed_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            tools:listitem="@layout/item_feed_photo" />
+            tools:listitem="@layout/item_feed_grid" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_hashtag.xml b/app/src/main/res/layout/fragment_hashtag.xml
index 7bd26633..45cd6b01 100644
--- a/app/src/main/res/layout/fragment_hashtag.xml
+++ b/app/src/main/res/layout/fragment_hashtag.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    app:layoutDescription="@xml/header_list_scene">
+
+    <include
+        android:id="@+id/header"
+        layout="@layout/layout_hashtag_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/swipe_refresh_layout"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header">
 
         <awais.instagrabber.customviews.PostsRecyclerView
             android:id="@+id/posts"
@@ -17,4 +30,4 @@
             android:layout_height="match_parent"
             android:clipToPadding="false" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_likes.xml b/app/src/main/res/layout/fragment_likes.xml
index 15d2763d..4ae110ab 100644
--- a/app/src/main/res/layout/fragment_likes.xml
+++ b/app/src/main/res/layout/fragment_likes.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,6 +15,7 @@
             android:id="@+id/rvLikes"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:clipToPadding="false" />
+            android:clipToPadding="false"
+            tools:listitem="@layout/item_follow" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
index 7bd26633..9293dc2a 100644
--- a/app/src/main/res/layout/fragment_location.xml
+++ b/app/src/main/res/layout/fragment_location.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    app:layoutDescription="@xml/header_list_scene">
+
+    <include
+        android:id="@+id/header"
+        layout="@layout/layout_location_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/swipe_refresh_layout"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header">
 
         <awais.instagrabber.customviews.PostsRecyclerView
             android:id="@+id/posts"
@@ -17,4 +30,4 @@
             android:layout_height="match_parent"
             android:clipToPadding="false" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 7a683ca9..051dd0aa 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
+    android:background="?attr/colorSurface"
+    app:layoutDescription="@xml/header_list_scene">
 
-    <!--<com.google.android.material.appbar.AppBarLayout-->
-    <!--    android:id="@+id/appBarLayout"-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="wrap_content"-->
-    <!--    android:background="?attr/colorSurface"-->
-    <!--    app:elevation="0dp"-->
-    <!--    app:layout_scrollFlags="scroll">-->
-
-    <!--    <com.google.android.material.appbar.CollapsingToolbarLayout-->
-    <!--        android:layout_width="match_parent"-->
-    <!--        android:layout_height="wrap_content"-->
-    <!--        app:layout_scrollFlags="scroll">-->
-
-    <!--        <include layout="@layout/layout_profile_details" />-->
-    <!--    </com.google.android.material.appbar.CollapsingToolbarLayout>-->
-    <!--</com.google.android.material.appbar.AppBarLayout>-->
+    <include
+        android:id="@+id/header"
+        layout="@layout/layout_profile_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/swipe_refresh_layout"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="0dp"
+        android:clipToPadding="false"
+        android:paddingBottom="?attr/actionBarSize"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header">
 
         <awais.instagrabber.customviews.PostsRecyclerView
             android:id="@+id/posts_recycler_view"
@@ -62,4 +58,4 @@
             android:text="@string/priv_acc"
             android:textAppearance="@style/TextAppearance.AppCompat.Large" />
     </LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.motion.widget.MotionLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
new file mode 100644
index 00000000..39c24c3c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab_layout"
+        style="@style/Widget.MaterialComponents.TabLayout.RegularCaps"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_topic_posts.xml b/app/src/main/res/layout/fragment_topic_posts.xml
index 4d82bbe3..fe8cef36 100644
--- a/app/src/main/res/layout/fragment_topic_posts.xml
+++ b/app/src/main/res/layout/fragment_topic_posts.xml
@@ -15,6 +15,7 @@
             android:id="@+id/collapsing_toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:contentScrim="?attr/toolbarColor"
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <FrameLayout
@@ -39,6 +40,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:background="@null"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml
index 6e222821..d17f9c82 100755
--- a/app/src/main/res/layout/item_comment.xml
+++ b/app/src/main/res/layout/item_comment.xml
@@ -5,125 +5,135 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?android:selectableItemBackground"
     android:clickable="true"
+    android:descendantFocusability="afterDescendants"
     android:focusable="true"
-    android:orientation="horizontal"
-    android:padding="8dp">
+    android:foreground="?selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="4dp">
 
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/ivProfilePic"
-        android:layout_width="@dimen/simple_item_picture_size"
-        android:layout_height="@dimen/simple_item_picture_size"
-        android:padding="4dp"
-        app:actualImageScaleType="centerCrop"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundAsCircle="true"
-        tools:background="@mipmap/ic_launcher" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvUsername"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/tvComment"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="username" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/isVerified"
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/profile_pic_guideline"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:scaleType="fitStart"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/tvUsername"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvUsername"
-        app:layout_constraintTop_toTopOf="@id/tvUsername"
-        app:srcCompat="@drawable/verified"
-        tools:visibility="visible" />
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="56dp" />
 
-    <awais.instagrabber.customviews.RamboTextViewV2
-        android:id="@+id/tvComment"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:autoLink="web|email"
-        android:ellipsize="end"
-        android:linksClickable="true"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        app:layout_constraintBottom_toTopOf="@id/tvLikes"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toBottomOf="@id/tvUsername"
-        tools:text="comment comment comment comment comment comment comment comment comment comment comment comment
-        comment comment comment comment comment comment comment comment comment comment comment comment comment comment comment comment" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvLikes"
+    <awais.instagrabber.customviews.ProfilePicView
+        android:id="@+id/profile_pic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:scrollbars="none"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/tvDate"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toBottomOf="@id/tvComment"
-        tools:text="likes" />
+        android:layout_marginEnd="16dp"
+        app:actualImageScaleType="centerCrop"
+        app:layout_constraintEnd_toStartOf="@id/profile_pic_guideline"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        app:size="small" />
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvDate"
+    <awais.instagrabber.customviews.UsernameTextView
+        android:id="@+id/username"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
-        android:gravity="end"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        android:textStyle="italic"
-        app:layout_constraintBaseline_toBaselineOf="@id/tvLikes"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+        android:textColor="?android:textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@id/date"
+        app:layout_constraintEnd_toStartOf="@id/options"
+        app:layout_constraintStart_toEndOf="@id/profile_pic_guideline"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="username username username" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/options"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="4dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_more_vert_24" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/date"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:alpha="0.8"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"
+        app:layout_constraintBottom_toTopOf="@id/comment"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        tools:text="long date..................." />
+
+    <awais.instagrabber.customviews.RamboTextViewV2
+        android:id="@+id/comment"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        app:layout_constraintBottom_toTopOf="@id/comment_barrier"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/date"
+        tools:text="comment comment comment comment comment comment comment comment comment comment comment comment" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/comment_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierDirection="bottom" />
+
+    <awais.instagrabber.customviews.TextViewDrawableSize
+        android:id="@+id/likes"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:layout_marginEnd="16dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:drawablePadding="4dp"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+        app:compoundDrawableHeight="16dp"
+        app:compoundDrawableWidth="16dp"
+        app:drawableTint="@color/red_800"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/replies"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="@id/comment"
+        app:layout_constraintTop_toBottomOf="@id/comment_barrier"
+        tools:text="99999" />
+
+    <awais.instagrabber.customviews.TextViewDrawableSize
+        android:id="@+id/replies"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:clickable="true"
+        android:drawablePadding="4dp"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+        app:compoundDrawableHeight="16dp"
+        app:compoundDrawableWidth="16dp"
+        app:drawableStartCompat="@drawable/ic_round_mode_comment_24"
+        app:drawableTint="@color/grey_500"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvLikes"
-        app:layout_constraintTop_toBottomOf="@id/tvComment"
-        tools:text="long date................................" />
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-    <!--<androidx.recyclerview.widget.RecyclerView-->
-    <!--    android:id="@+id/rvChildComments"-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="wrap_content"-->
-    <!--    android:layout_marginStart="40dp"-->
-    <!--    android:layout_marginLeft="40dp"-->
-    <!--    app:layoutManager="LinearLayoutManager"-->
-    <!--    tools:itemCount="5"-->
-    <!--    tools:listitem="@layout/item_comment_small" />-->
-
-    <!--<View-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="1dp"-->
-    <!--    android:layout_gravity="bottom"-->
-    <!--    android:layout_marginStart="4dp"-->
-    <!--    android:layout_marginEnd="4dp"-->
-    <!--    android:layout_marginBottom="4dp"-->
-    <!--    android:background="#32888888" />-->
\ No newline at end of file
+        app:layout_constraintStart_toEndOf="@id/likes"
+        app:layout_constraintTop_toBottomOf="@id/comment_barrier"
+        tools:text="9999" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_comment_small.xml b/app/src/main/res/layout/item_comment_small.xml
deleted file mode 100755
index 544c93e9..00000000
--- a/app/src/main/res/layout/item_comment_small.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingStart="40dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="8dp"
-    android:paddingBottom="2dp">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/ivProfilePic"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        app:actualImageScaleType="centerCrop"
-        app:layout_constraintEnd_toStartOf="@id/tvUsername"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundAsCircle="true"
-        tools:background="@mipmap/ic_launcher" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvUsername"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        android:textColor="?android:textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@id/tvComment"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="username" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/isVerified"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="fitStart"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@id/tvUsername"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvUsername"
-        app:layout_constraintTop_toTopOf="@id/tvUsername"
-        app:srcCompat="@drawable/verified"
-        tools:visibility="visible" />
-
-    <awais.instagrabber.customviews.RamboTextViewV2
-        android:id="@+id/tvComment"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:autoLink="web|email"
-        android:clickable="true"
-        android:ellipsize="end"
-        android:focusable="true"
-        android:linksClickable="true"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:textAppearance="@style/TextAppearance.AppCompat"
-        app:layout_constraintBottom_toTopOf="@id/tvLikes"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toBottomOf="@id/tvUsername"
-        tools:text="comment comment comment comment comment comment comment comment
-        comment comment comment comment comment comment comment comment comment comment comment comment comment comment
-        comment comment comment comment comment comment " />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvLikes"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:paddingStart="4dp"
-        android:paddingTop="2dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="2dp"
-        android:scrollbars="none"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/tvDate"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toBottomOf="@id/tvComment"
-        tools:text="likes" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvDate"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        android:textStyle="italic"
-        app:layout_constraintBaseline_toBaselineOf="@id/tvLikes"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvLikes"
-        app:layout_constraintTop_toBottomOf="@id/tvComment"
-        tools:text="date....." />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml
index ab2d0bd9..4683be31 100755
--- a/app/src/main/res/layout/item_follow.xml
+++ b/app/src/main/res/layout/item_follow.xml
@@ -1,51 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:foreground="?android:selectableItemBackground"
-    android:padding="8dp">
+    android:background="?android:selectableItemBackground"
+    android:padding="16dp">
 
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/ivProfilePic"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter" />
+    <awais.instagrabber.customviews.ProfilePicView
+        android:id="@+id/profile_pic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/username"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:size="small" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:layout_marginStart="66dp"
-        android:layout_marginEnd="26dp"
-        android:orientation="vertical">
+    <awais.instagrabber.customviews.UsernameTextView
+        android:id="@+id/username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
+        app:layout_constraintBottom_toTopOf="@id/full_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/profile_pic"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="username" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvFullName"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            app:autoSizeMaxTextSize="28sp"
-            app:autoSizeMinTextSize="16sp"
-            app:autoSizeTextType="uniform" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvUsername"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
-    </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/isAdmin"
-        android:layout_width="20dp"
-        android:layout_height="60dp"
-        android:layout_gravity="end"
-        android:scaleType="fitCenter"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_star_24" />
-</FrameLayout>
\ No newline at end of file
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/full_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@id/username"
+        app:layout_constraintTop_toBottomOf="@id/username"
+        tools:text="Full Name" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_highlight.xml b/app/src/main/res/layout/item_highlight.xml
index 61269c9e..f71ccbb4 100755
--- a/app/src/main/res/layout/item_highlight.xml
+++ b/app/src/main/res/layout/item_highlight.xml
@@ -20,6 +20,7 @@
         android:gravity="center"
         android:maxLines="1"
         android:padding="2dp"
+        android:scrollbars="none"
         android:singleLine="true"
         android:textColor="?attr/colorOnPrimarySurface"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/item_suggestion.xml b/app/src/main/res/layout/item_search_result.xml
old mode 100755
new mode 100644
similarity index 63%
rename from app/src/main/res/layout/item_suggestion.xml
rename to app/src/main/res/layout/item_search_result.xml
index 8020090a..e6987925
--- a/app/src/main/res/layout/item_suggestion.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -13,7 +13,7 @@
     android:paddingBottom="8dp">
 
     <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/ivProfilePic"
+        android:id="@+id/profile_pic"
         android:layout_width="40dp"
         android:layout_height="40dp"
         app:actualImageScaleType="centerCrop"
@@ -23,46 +23,61 @@
         tools:background="@mipmap/ic_launcher" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvUsername"
+        android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:gravity="center_vertical"
+        android:maxLines="1"
         android:paddingStart="16dp"
         android:paddingEnd="4dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        app:layout_constraintBottom_toTopOf="@id/tvFullName"
-        app:layout_constraintEnd_toStartOf="@id/isVerified"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
+        app:layout_constraintBottom_toTopOf="@id/subtitle"
+        app:layout_constraintEnd_toStartOf="@id/verified"
+        app:layout_constraintStart_toEndOf="@id/profile_pic"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="username" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvFullName"
+        android:id="@+id/subtitle"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:gravity="center_vertical"
+        android:maxLines="1"
         android:paddingStart="16dp"
         android:paddingEnd="0dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/ivProfilePic"
-        app:layout_constraintTop_toBottomOf="@id/tvUsername"
+        app:layout_constraintEnd_toStartOf="@id/delete"
+        app:layout_constraintStart_toEndOf="@id/profile_pic"
+        app:layout_constraintTop_toBottomOf="@id/title"
         tools:text="full name"
         tools:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/isVerified"
+        android:id="@+id/verified"
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:layout_gravity="end"
         android:adjustViewBounds="true"
         android:scaleType="fitCenter"
         android:visibility="gone"
-        app:layout_constraintBaseline_toBaselineOf="@id/tvUsername"
-        app:layout_constraintBottom_toTopOf="@id/tvFullName"
-        app:layout_constraintStart_toEndOf="@id/tvUsername"
+        app:layout_constraintBaseline_toBaselineOf="@id/title"
+        app:layout_constraintBottom_toTopOf="@id/subtitle"
+        app:layout_constraintStart_toEndOf="@id/title"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/verified"
         tools:visibility="visible" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/delete"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:padding="8dp"
+        android:src="@drawable/ic_close_24"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_exo_custom_controls.xml b/app/src/main/res/layout/layout_exo_custom_controls.xml
index 4292ebbc..8b9c7d40 100644
--- a/app/src/main/res/layout/layout_exo_custom_controls.xml
+++ b/app/src/main/res/layout/layout_exo_custom_controls.xml
@@ -3,52 +3,25 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/black_a80"
-    android:padding="8dp">
+    android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/from_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/play_pause"
-        app:layout_constraintEnd_toStartOf="@id/timeline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="0:00" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/timeline"
+    <View
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/player_timeline_desc"
-        android:enabled="false"
-        android:value="0"
-        android:valueFrom="0.0"
-        android:valueTo="1.0"
-        app:labelStyle="@style/Widget.MaterialComponents.Tooltip.ExoPlayer"
-        app:layout_constraintBottom_toTopOf="@id/play_pause"
-        app:layout_constraintEnd_toStartOf="@id/to_time"
-        app:layout_constraintStart_toEndOf="@id/from_time"
-        app:layout_constraintTop_toTopOf="parent"
-        app:thumbColor="@color/white"
-        app:trackColorActive="@color/white"
-        app:trackColorInactive="@color/grey_800" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/to_time"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/play_pause"
+        android:layout_height="0dp"
+        android:background="@color/exo_black_opacity_60"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/timeline"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="0:00" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/top_barrier" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/top_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierDirection="top" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/rew_with_amount"
+        android:id="@+id/exo_rew_with_amount"
         style="@style/Widget.App.MaterialButton.IconOnly.BorderlessRipple"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -56,42 +29,43 @@
         app:icon="@drawable/ic_replay_5_24_states"
         app:iconSize="24dp"
         app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/play_pause"
+        app:layout_constraintBottom_toTopOf="@id/progress_barrier"
+        app:layout_constraintEnd_toStartOf="@id/exo_play_pause"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/timeline"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         tools:enabled="false"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/play_pause"
-        style="@style/Widget.App.MaterialButton.IconOnly.BorderlessRipple"
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/exo_play_pause"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_play_states"
-        app:iconSize="24dp"
-        app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/ff_with_amount"
-        app:layout_constraintStart_toEndOf="@id/rew_with_amount"
-        app:layout_constraintTop_toBottomOf="@id/timeline"
+        android:layout_height="0dp"
+        android:background="@drawable/background_grey_ripple"
+        android:contentDescription="@string/exo_controls_play_description"
+        android:padding="8dp"
+        android:scaleType="fitCenter"
+        android:src="@drawable/exo_styled_controls_play"
+        app:layout_constraintBottom_toTopOf="@id/progress_barrier"
+        app:layout_constraintEnd_toStartOf="@id/exo_ffwd_with_amount"
+        app:layout_constraintStart_toEndOf="@id/exo_rew_with_amount"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         tools:enabled="false"
         tools:visibility="visible" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/ff_with_amount"
+        android:id="@+id/exo_ffwd_with_amount"
         style="@style/Widget.App.MaterialButton.IconOnly.BorderlessRipple"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:icon="@drawable/ic_forward_5_24_states"
         app:iconSize="24dp"
         app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/progress_barrier"
         app:layout_constraintEnd_toStartOf="@id/mute"
-        app:layout_constraintStart_toEndOf="@id/play_pause"
-        app:layout_constraintTop_toBottomOf="@id/timeline"
+        app:layout_constraintStart_toEndOf="@id/exo_play_pause"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         tools:enabled="false"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/mute"
@@ -101,25 +75,68 @@
         app:icon="@drawable/ic_volume_off_24_states"
         app:iconSize="24dp"
         app:iconTint="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/speed"
-        app:layout_constraintStart_toEndOf="@id/ff_with_amount"
-        app:layout_constraintTop_toBottomOf="@id/timeline"
+        app:layout_constraintBottom_toTopOf="@id/progress_barrier"
+        app:layout_constraintEnd_toStartOf="@id/exo_settings"
+        app:layout_constraintStart_toEndOf="@id/exo_ffwd_with_amount"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         tools:enabled="false"
         tools:visibility="visible" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/speed"
+        android:id="@+id/exo_settings"
         style="@style/Widget.App.MaterialButton.IconOnly.BorderlessRipple"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/one_x"
-        android:textAllCaps="false"
-        android:textColor="@drawable/speed_text_color_states"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:icon="@drawable/exo_ic_settings"
+        app:iconSize="24dp"
+        app:iconTint="@color/white"
+        app:layout_constraintBottom_toTopOf="@id/progress_barrier"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/mute"
-        app:layout_constraintTop_toBottomOf="@id/timeline"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         tools:enabled="false"
         tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/progress_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierDirection="top" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/exo_position"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/exo_progress"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_barrier"
+        tools:text="0:00"
+        tools:visibility="gone" />
+
+    <com.google.android.exoplayer2.ui.DefaultTimeBar
+        android:id="@+id/exo_progress"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/exo_duration"
+        app:layout_constraintStart_toEndOf="@id/exo_position"
+        app:layout_constraintTop_toBottomOf="@id/progress_barrier"
+        app:layout_constraintVertical_bias="1"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/exo_duration"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:textColor="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/exo_progress"
+        app:layout_constraintTop_toBottomOf="@id/progress_barrier"
+        tools:text="0:00"
+        tools:visibility="gone" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_hashtag_details.xml b/app/src/main/res/layout/layout_hashtag_details.xml
index 56ddc32e..7f947541 100644
--- a/app/src/main/res/layout/layout_hashtag_details.xml
+++ b/app/src/main/res/layout/layout_hashtag_details.xml
@@ -2,10 +2,9 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/tagInfoContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="?attr/actionBarSize"
+    android:background="?toolbarColor"
     android:padding="@dimen/profile_info_container_bottom_space">
 
     <awais.instagrabber.customviews.CircularImageView
diff --git a/app/src/main/res/layout/layout_location_details.xml b/app/src/main/res/layout/layout_location_details.xml
index bc880ebf..34b8ae49 100644
--- a/app/src/main/res/layout/layout_location_details.xml
+++ b/app/src/main/res/layout/layout_location_details.xml
@@ -2,11 +2,10 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/locInfoContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="?attr/actionBarSize"
     android:animateLayoutChanges="true"
+    android:background="?toolbarColor"
     android:padding="8dp">
 
     <awais.instagrabber.customviews.CircularImageView
@@ -20,20 +19,20 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:background="@mipmap/ic_launcher" />
 
-<!--    <androidx.appcompat.widget.AppCompatTextView-->
-<!--        android:id="@+id/mainLocPostCount"-->
-<!--        android:layout_width="0dp"-->
-<!--        android:layout_height="0dp"-->
-<!--        android:gravity="center_vertical"-->
-<!--        android:maxLines="1"-->
-<!--        android:paddingStart="12dp"-->
-<!--        android:paddingEnd="12dp"-->
-<!--        android:textAppearance="@style/TextAppearance.AppCompat"-->
-<!--        app:layout_constraintBottom_toTopOf="@id/btnMap"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"-->
-<!--        app:layout_constraintStart_toEndOf="@id/mainLocationImage"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        tools:text="35 Posts" />-->
+    <!--    <androidx.appcompat.widget.AppCompatTextView-->
+    <!--        android:id="@+id/mainLocPostCount"-->
+    <!--        android:layout_width="0dp"-->
+    <!--        android:layout_height="0dp"-->
+    <!--        android:gravity="center_vertical"-->
+    <!--        android:maxLines="1"-->
+    <!--        android:paddingStart="12dp"-->
+    <!--        android:paddingEnd="12dp"-->
+    <!--        android:textAppearance="@style/TextAppearance.AppCompat"-->
+    <!--        app:layout_constraintBottom_toTopOf="@id/btnMap"-->
+    <!--        app:layout_constraintEnd_toEndOf="parent"-->
+    <!--        app:layout_constraintStart_toEndOf="@id/mainLocationImage"-->
+    <!--        app:layout_constraintTop_toTopOf="parent"-->
+    <!--        tools:text="35 Posts" />-->
 
     <com.google.android.material.chip.Chip
         android:id="@+id/btnMap"
@@ -44,8 +43,8 @@
         app:chipBackgroundColor="@null"
         app:chipIcon="@drawable/ic_outline_map_24"
         app:chipIconTint="@color/green_500"
-        app:layout_constraintTop_toTopOf="@id/mainLocationImage"
         app:layout_constraintStart_toEndOf="@id/mainLocationImage"
+        app:layout_constraintTop_toTopOf="@id/mainLocationImage"
         app:rippleColor="@color/grey_500"
         tools:visibility="visible" />
 
@@ -86,8 +85,8 @@
         android:id="@+id/locationBiography"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:padding="8dp"
         android:background="?android:selectableItemBackground"
+        android:padding="8dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/layout_post_view_bottom.xml b/app/src/main/res/layout/layout_post_view_bottom.xml
new file mode 100644
index 00000000..ad141b1b
--- /dev/null
+++ b/app/src/main/res/layout/layout_post_view_bottom.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/buttons_top_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierAllowsGoneWidgets="true"
+        app:barrierDirection="bottom" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/like"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="36dp"
+        android:layout_height="40dp"
+        android:background="@drawable/background_grey_ripple"
+        android:visibility="visible"
+        app:icon="@drawable/ic_not_liked"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="22dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/likes_count"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:visibility="visible" />
+
+    <awais.instagrabber.customviews.FormattedNumberTextView
+        android:id="@+id/likes_count"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_marginEnd="0dp"
+        android:background="@drawable/background_grey_ripple"
+        android:gravity="center_vertical"
+        android:maxWidth="100dp"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="@id/like"
+        app:layout_constraintEnd_toStartOf="@id/comment"
+        app:layout_constraintStart_toEndOf="@id/like"
+        app:layout_constraintTop_toTopOf="@id/like"
+        tools:text="9.9k" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/comment"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="36dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="8dp"
+        android:background="@drawable/background_grey_ripple"
+        app:icon="@drawable/ic_outline_comments_24"
+        app:iconPadding="0dp"
+        app:iconSize="22dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/comments_count"
+        app:layout_constraintStart_toEndOf="@id/likes_count"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier" />
+
+    <awais.instagrabber.customviews.FormattedNumberTextView
+        android:id="@+id/comments_count"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:background="@drawable/background_grey_ripple"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxWidth="100dp"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/space_1"
+        app:layout_constraintStart_toEndOf="@id/comment"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier"
+        tools:text="9999999999999999999999999999999999999999" />
+
+    <Space
+        android:id="@+id/space_1"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/share"
+        app:layout_constraintStart_toEndOf="@id/comments_count"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/share"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="48dp"
+        android:layout_height="40dp"
+        android:background="@drawable/background_grey_ripple"
+        app:icon="?attr/actionModeShareDrawable"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="18dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/save"
+        app:layout_constraintStart_toEndOf="@id/space_1"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/save"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="48dp"
+        android:layout_height="40dp"
+        android:background="@drawable/background_grey_ripple"
+        android:visibility="visible"
+        app:icon="@drawable/ic_round_bookmark_border_24"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="18dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toStartOf="@id/download"
+        app:layout_constraintStart_toEndOf="@id/share"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier"
+        tools:visibility="visible" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/download"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="48dp"
+        android:layout_height="40dp"
+        android:background="@drawable/background_grey_ripple"
+        android:visibility="visible"
+        app:icon="@drawable/ic_download"
+        app:iconGravity="textStart"
+        app:iconPadding="0dp"
+        app:iconSize="18dp"
+        app:layout_constraintBottom_toTopOf="@id/buttons_bottom_barrier"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/save"
+        app:layout_constraintTop_toBottomOf="@id/buttons_top_barrier"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/buttons_bottom_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierAllowsGoneWidgets="true"
+        app:barrierDirection="top" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/date"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        app:layout_constraintBottom_toTopOf="@id/caption_barrier"
+        app:layout_constraintEnd_toStartOf="@id/views_count"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/buttons_bottom_barrier"
+        tools:layout_constraintVertical_chainStyle="packed"
+        tools:text="2020-11-07 11:18:55"
+        tools:visibility="visible" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/views_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/date"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/date"
+        app:layout_constraintTop_toTopOf="@id/date"
+        tools:text="9999999999 views"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/caption_barrier"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:barrierAllowsGoneWidgets="true"
+        app:barrierDirection="bottom" />
+
+    <awais.instagrabber.customviews.RamboTextViewV2
+        android:id="@+id/caption"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@null"
+        android:clickable="true"
+        android:focusable="true"
+        android:padding="8dp"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+        app:layout_constraintBottom_toTopOf="@id/translate"
+        app:layout_constraintTop_toBottomOf="@id/caption_barrier"
+        app:layout_constraintVertical_bias="0"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="Text text text Text text text Text text text Text text text Text text text"
+        tools:visibility="visible" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/translate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:gravity="center_vertical"
+        android:padding="8dp"
+        android:text="@string/translate_caption"
+        android:textColor="@color/blue_600"
+        android:textSize="16sp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/caption" />
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_profile_details.xml b/app/src/main/res/layout/layout_profile_details.xml
index 035a04b0..d7f5bdd8 100644
--- a/app/src/main/res/layout/layout_profile_details.xml
+++ b/app/src/main/res/layout/layout_profile_details.xml
@@ -2,10 +2,9 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/infoContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="?attr/actionBarSize">
+    android:background="?toolbarColor">
 
     <awais.instagrabber.customviews.CircularImageView
         android:id="@+id/mainProfileImage"
@@ -327,7 +326,8 @@
         android:id="@+id/highlights_barrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:barrierDirection="bottom" />
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="mainPostCount, mainFollowers, mainFollowing" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/highlightsList"
diff --git a/app/src/main/res/layout/layout_video_player_with_thumbnail.xml b/app/src/main/res/layout/layout_video_player_with_thumbnail.xml
index c1ee50c3..a467fff2 100644
--- a/app/src/main/res/layout/layout_video_player_with_thumbnail.xml
+++ b/app/src/main/res/layout/layout_video_player_with_thumbnail.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -15,7 +14,7 @@
             android:id="@+id/thumbnail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:actualImageScaleType="centerCrop"
+            app:actualImageScaleType="fitCenter"
             app:viewAspectRatio="1" />
 
         <androidx.appcompat.widget.AppCompatImageView
@@ -25,11 +24,13 @@
             app:srcCompat="@drawable/ic_video_24" />
     </FrameLayout>
 
+    <!--app:controller_layout_id="@layout/layout_exo_custom_controls"-->
     <com.google.android.exoplayer2.ui.StyledPlayerView
         android:id="@+id/playerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"
-        app:resize_mode="fit"
-        app:show_timeout="1000" />
+        app:resize_mode="fixed_width"
+        app:show_timeout="2000"
+        app:use_controller="true" />
 </ViewSwitcher>
\ No newline at end of file
diff --git a/app/src/main/res/menu/collection_posts_menu.xml b/app/src/main/res/menu/collection_posts_menu.xml
index 5759b068..3ad2b822 100644
--- a/app/src/main/res/menu/collection_posts_menu.xml
+++ b/app/src/main/res/menu/collection_posts_menu.xml
@@ -4,15 +4,15 @@
 
     <item
         android:id="@+id/edit"
-        android:icon="@android:drawable/ic_menu_edit"
+        android:icon="@drawable/ic_round_edit_24"
         android:title="@string/edit_collection"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/delete"
-        android:icon="@android:drawable/ic_menu_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/delete_collection"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/layout"
diff --git a/app/src/main/res/menu/comment_options_menu.xml b/app/src/main/res/menu/comment_options_menu.xml
new file mode 100644
index 00000000..cd453454
--- /dev/null
+++ b/app/src/main/res/menu/comment_options_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/translate"
+        android:title="@string/comment_viewer_translate_comment" />
+    <item
+        android:id="@+id/delete"
+        android:title="@string/delete" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 2ad8da42..b73c4b97 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <!--<item-->
-    <!--    android:id="@+id/favourites"-->
-    <!--    android:enabled="true"-->
-    <!--    android:icon="@drawable/ic_star_24"-->
-    <!--    android:title="@string/title_favorites"-->
-    <!--    app:showAsAction="ifRoom" />-->
-
-    <!--<item-->
-    <!--    android:id="@+id/direct_messages"-->
-    <!--    android:enabled="true"-->
-    <!--    android:icon="@drawable/ic_send_24"-->
-    <!--    android:title="@string/action_dms"-->
-    <!--    app:showAsAction="always" />-->
-
     <item
         android:id="@+id/search"
         android:enabled="true"
         android:icon="@drawable/ic_search_24"
-        android:title="@string/action_search"
-        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView" />
+        android:title="@string/search"
+        app:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/story_menu.xml b/app/src/main/res/menu/story_menu.xml
index a7293f91..8169fd62 100644
--- a/app/src/main/res/menu/story_menu.xml
+++ b/app/src/main/res/menu/story_menu.xml
@@ -5,13 +5,18 @@
     <item
         android:id="@+id/action_dms"
         android:icon="@drawable/ic_round_send_24"
-        android:title="@string/action_dms"
-        android:titleCondensed="@string/action_dms"
-        app:showAsAction="always" />
+        android:title="@string/reply_story"
+        android:titleCondensed="@string/reply_story"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_profile"
+        android:title="@string/open_profile"
+        android:titleCondensed="@string/open_profile"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_download"
         android:icon="@drawable/ic_download"
         android:title="@string/action_download"
         android:titleCondensed="@string/action_download"
-        app:showAsAction="always" />
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c4a603d4..4ae7d123 100755
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@mipmap/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..4ae7d123
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 11841075..1c98720a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 00000000..dfb28126
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index ac8e78db..20f9f02a 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..df02399c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index e573bea6..4f2cf969 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 00000000..80052d0a
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index a7ceecb3..fec75acd 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..ed782ce7
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 37945d37..2bcd38e9 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 00000000..1f184f3f
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index a2e9a12f..b0e4a2a1 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..f30b44fc
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 1a5e312a..a0c48325 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 00000000..4a13f488
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index f5276a93..dec52657 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..46dcb746
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 7f40a02f..3c525e03 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 00000000..beb64c17
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..def3ef62
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..1cbcb56d
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/navigation/comments_nav_graph.xml b/app/src/main/res/navigation/comments_nav_graph.xml
index 82ffd80c..0cec9091 100644
--- a/app/src/main/res/navigation/comments_nav_graph.xml
+++ b/app/src/main/res/navigation/comments_nav_graph.xml
@@ -29,7 +29,7 @@
 
     <dialog
         android:id="@+id/commentsViewerFragment"
-        android:name="awais.instagrabber.fragments.CommentsViewerFragment"
+        android:name="awais.instagrabber.fragments.comments.CommentsViewerFragment"
         android:label="Comments"
         tools:layout="@layout/fragment_comments">
         <argument
diff --git a/app/src/main/res/navigation/direct_messages_nav_graph.xml b/app/src/main/res/navigation/direct_messages_nav_graph.xml
index 1cf39e25..bd0eefcd 100644
--- a/app/src/main/res/navigation/direct_messages_nav_graph.xml
+++ b/app/src/main/res/navigation/direct_messages_nav_graph.xml
@@ -96,6 +96,22 @@
         android:id="@+id/action_global_user_search"
         app:destination="@id/user_search_nav_graph" />
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/directMessagesInboxFragment"
         android:name="awais.instagrabber.fragments.directmessages.DirectMessageInboxFragment"
@@ -187,4 +203,14 @@
             android:id="@+id/action_pending_inbox_to_thread"
             app:destination="@id/directMessagesThreadFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/discover_nav_graph.xml b/app/src/main/res/navigation/discover_nav_graph.xml
index 537e5eae..ee13ef9b 100644
--- a/app/src/main/res/navigation/discover_nav_graph.xml
+++ b/app/src/main/res/navigation/discover_nav_graph.xml
@@ -95,6 +95,22 @@
             app:argType="long" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/discoverFragment"
         android:name="awais.instagrabber.fragments.main.DiscoverFragment"
@@ -120,4 +136,14 @@
             android:name="backgroundColor"
             app:argType="integer" />
     </fragment>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/favorites_nav_graph.xml b/app/src/main/res/navigation/favorites_nav_graph.xml
index 1a288bf1..a1a218ff 100644
--- a/app/src/main/res/navigation/favorites_nav_graph.xml
+++ b/app/src/main/res/navigation/favorites_nav_graph.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/favorites_nav_graph"
     app:startDestination="@id/favoritesFragment">
 
@@ -36,8 +37,18 @@
             app:argType="long" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
     <fragment
         android:id="@+id/favoritesFragment"
         android:name="awais.instagrabber.fragments.FavoritesFragment"
-        android:label="@string/title_favorites" />
+        android:label="@string/title_favorites"
+        tools:layout="@layout/fragment_favorites" />
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/feed_nav_graph.xml b/app/src/main/res/navigation/feed_nav_graph.xml
index f9e26cc8..611c933f 100644
--- a/app/src/main/res/navigation/feed_nav_graph.xml
+++ b/app/src/main/res/navigation/feed_nav_graph.xml
@@ -106,6 +106,22 @@
             app:nullable="false" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/feedFragment"
         android:name="awais.instagrabber.fragments.main.FeedFragment"
@@ -115,7 +131,6 @@
             android:id="@+id/action_feedFragment_to_storyViewerFragment"
             app:destination="@id/storyViewerFragment" />
     </fragment>
-
     <fragment
         android:id="@+id/storyViewerFragment"
         android:name="awais.instagrabber.fragments.StoryViewerFragment"
@@ -125,4 +140,14 @@
             android:name="options"
             app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
     </fragment>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/hashtag_nav_graph.xml b/app/src/main/res/navigation/hashtag_nav_graph.xml
index b4d6d31a..41c911c2 100644
--- a/app/src/main/res/navigation/hashtag_nav_graph.xml
+++ b/app/src/main/res/navigation/hashtag_nav_graph.xml
@@ -65,6 +65,22 @@
             app:argType="long" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/hashTagFragment"
         android:name="awais.instagrabber.fragments.HashTagFragment"
@@ -87,6 +103,11 @@
             android:name="options"
             app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
     </fragment>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
     <action
         android:id="@+id/action_global_hashTagFragment"
         app:destination="@id/hashTagFragment">
@@ -95,4 +116,9 @@
             app:argType="string"
             app:nullable="false" />
     </action>
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/location_nav_graph.xml b/app/src/main/res/navigation/location_nav_graph.xml
index acc33413..4a2935a4 100644
--- a/app/src/main/res/navigation/location_nav_graph.xml
+++ b/app/src/main/res/navigation/location_nav_graph.xml
@@ -66,6 +66,22 @@
             app:nullable="false" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/locationFragment"
         android:name="awais.instagrabber.fragments.LocationFragment"
@@ -94,4 +110,14 @@
             android:name="options"
             app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
     </fragment>
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/notification_viewer_nav_graph.xml b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
index 50e2fbdf..b60bd3b8 100644
--- a/app/src/main/res/navigation/notification_viewer_nav_graph.xml
+++ b/app/src/main/res/navigation/notification_viewer_nav_graph.xml
@@ -13,7 +13,7 @@
         <argument
             android:name="username"
             app:argType="string"
-            app:nullable="true" />
+            app:nullable="false" />
     </action>
 
     <action
@@ -72,6 +72,18 @@
             app:argType="boolean" />
     </action>
 
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/storyViewerFragment"
         android:name="awais.instagrabber.fragments.StoryViewerFragment"
@@ -100,4 +112,9 @@
             android:id="@+id/action_notifications_to_story"
             app:destination="@id/storyViewerFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/profile_nav_graph.xml b/app/src/main/res/navigation/profile_nav_graph.xml
index 8bff84b8..e33e5c9b 100644
--- a/app/src/main/res/navigation/profile_nav_graph.xml
+++ b/app/src/main/res/navigation/profile_nav_graph.xml
@@ -56,7 +56,6 @@
         app:destination="@id/profile_nav_graph">
         <argument
             android:name="username"
-            android:defaultValue=""
             app:argType="string"
             app:nullable="false" />
     </action>
@@ -82,6 +81,21 @@
             android:name="targetId"
             android:defaultValue="0L"
             app:argType="long" />
+        <action
+            android:id="@+id/action_notifications_to_story"
+            app:destination="@id/storyViewerFragment" />
+    </action>
+
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
     </action>
 
     <fragment
@@ -91,9 +105,9 @@
         tools:layout="@layout/fragment_notifications_viewer">
         <argument
             android:name="type"
+            android:defaultValue="notif"
             app:argType="string"
-            app:nullable="false"
-            android:defaultValue="notif"/>
+            app:nullable="false" />
         <argument
             android:name="targetId"
             android:defaultValue="0L"
@@ -110,6 +124,10 @@
             app:argType="boolean" />
     </action>
 
+    <action
+        android:id="@+id/action_global_search"
+        app:destination="@id/searchFragment" />
+
     <fragment
         android:id="@+id/profileFragment"
         android:name="awais.instagrabber.fragments.main.ProfileFragment"
@@ -186,32 +204,14 @@
             android:name="options"
             app:argType="awais.instagrabber.repositories.requests.StoryViewerOptions" />
     </fragment>
-    <!--<fragment-->
-    <!--    android:id="@+id/directMessagesThreadFragment"-->
-    <!--    android:name="awais.instagrabber.fragments.directmessages.DirectMessageThreadFragment"-->
-    <!--    android:label="DirectMessagesThreadFragment"-->
-    <!--    tools:layout="@layout/fragment_direct_messages_thread">-->
-    <!--    <argument-->
-    <!--        android:name="threadId"-->
-    <!--        app:argType="string" />-->
-    <!--    <argument-->
-    <!--        android:name="title"-->
-    <!--        app:argType="string" />-->
-    <!--    <action-->
-    <!--        android:id="@+id/action_dMThreadFragment_to_dMSettingsFragment"-->
-    <!--        app:destination="@id/directMessagesSettingsFragment" />-->
-    <!--</fragment>-->
-    <!--<fragment-->
-    <!--    android:id="@+id/directMessagesSettingsFragment"-->
-    <!--    android:name="awais.instagrabber.fragments.directmessages.DirectMessageSettingsFragment"-->
-    <!--    android:label="@string/details"-->
-    <!--    tools:layout="@layout/fragment_direct_messages_settings">-->
-    <!--    <argument-->
-    <!--        android:name="threadId"-->
-    <!--        app:argType="string"-->
-    <!--        app:nullable="false"/>-->
-    <!--    <argument-->
-    <!--        android:name="title"-->
-    <!--        app:argType="string" />-->
-    <!--</fragment>-->
+    <fragment
+        android:id="@+id/searchFragment"
+        android:name="awais.instagrabber.fragments.search.SearchFragment"
+        android:label="@string/search"
+        tools:layout="@layout/fragment_search" />
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/saved_nav_graph.xml b/app/src/main/res/navigation/saved_nav_graph.xml
index 805a06e5..e30af1cc 100644
--- a/app/src/main/res/navigation/saved_nav_graph.xml
+++ b/app/src/main/res/navigation/saved_nav_graph.xml
@@ -64,15 +64,27 @@
             app:nullable="false" />
     </action>
 
+    <action
+        android:id="@+id/action_global_post_view"
+        app:destination="@id/postViewFragment">
+        <argument
+            android:name="media"
+            app:argType="awais.instagrabber.repositories.responses.Media"
+            app:nullable="false" />
+        <argument
+            android:name="position"
+            app:argType="integer" />
+    </action>
+
     <fragment
         android:id="@+id/savedCollectionsFragment"
         android:name="awais.instagrabber.fragments.SavedCollectionsFragment"
         android:label="@string/saved"
-        tools:layout="@layout/fragment_saved_collections" >
+        tools:layout="@layout/fragment_saved_collections">
         <argument
             android:name="isSaving"
-            app:argType="boolean"
-            android:defaultValue="false" />
+            android:defaultValue="false"
+            app:argType="boolean" />
         <action
             android:id="@+id/action_savedCollectionsFragment_to_collectionPostsFragment"
             app:destination="@id/collectionPostsFragment" />
@@ -93,4 +105,9 @@
             android:name="backgroundColor"
             app:argType="integer" />
     </fragment>
+    <fragment
+        android:id="@+id/postViewFragment"
+        android:name="awais.instagrabber.fragments.PostViewV2Fragment"
+        android:label="Post"
+        tools:layout="@layout/dialog_post_view" />
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/arrays.xml b/app/src/main/res/values-ca/arrays.xml
index 8a29e7bd..34d4e174 100644
--- a/app/src/main/res/values-ca/arrays.xml
+++ b/app/src/main/res/values-ca/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>segons</item>
         <item>minuts</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 18b0557d..90b7a5da 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -21,10 +21,12 @@
     <string name="title_comments">Comentaris</string>
     <string name="title_notifications">Activitat</string>
     <string name="update_check">Cerca actualitzacions a l\'inici</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">Bloca les captures de pantalla &amp; previsualització de l\'aplicació</string>
     <string name="download_user_folder">Descarrega les publicacions a carpetes de nom d\'usuari</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Marca les històries com a vistes després de visualitzar-es</string>
     <string name="mark_as_seen_setting_summary">L\'autor de la història sabrà que l\'has vista</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Marca els missatges com a vists després de visualitzar-los</string>
     <string name="dm_mark_as_seen_setting_summary">Altres membres sabran que l\'has vist</string>
     <string name="activity_setting">Habilitar les notificacions d\'activitat</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\n Seguint</string>
     <string name="post_viewer_autoplay_video">Reproduir vídeos automàticament</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Silenciar sempre els vídeos</string>
     <string name="post_viewer_show_captions">Mostrar sempre els subtítols</string>
     <string name="post_viewer_download_dialog_title">Seleccionar el que s\'ha de descarregar</string>
@@ -179,7 +183,7 @@
     <string name="dms_inbox_raven_media_suggested">Suggerit</string>
     <string name="dms_inbox_raven_media_screenshot">Captura de pantalla feta</string>
     <string name="dms_inbox_raven_media_cant_deliver">No es pot lliurar</string>
-    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
+    <string name="dms_inbox_error_null_count">La resposta de recompte no vista és nul·la!</string>
     <string name="dms_thread_message_hint">Missatge...</string>
     <string name="dms_thread_audio_hint">Premeu i mantingueu premut per enregistrar l\'àudio</string>
     <string name="dms_thread_updating">S\'està actualitzant...</string>
@@ -187,9 +191,9 @@
     <string name="dms_action_leave_question">Vols sortir d\'aquest xat?</string>
     <string name="dms_action_kick">Expulsar</string>
     <string name="dms_left_users">Usuaris que han marxat</string>
-    <string name="dms_ERROR_INVALID_USER">Invalid user</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_INVALID_USER">Usuari/a invàlid</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram no permet pujar vídeos més de 60 segons per DM.</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram no permet pujar àudio de més de 60 segons.</string>
     <string name="direct_download">Baixar directament</string>
     <string name="direct_download_desc">Descarregar publicacions directament al telèfon!</string>
     <string name="direct_download_loading">S\'estan recuperant les noves publicacions</string>
@@ -449,14 +453,35 @@
     <string name="secs">segons</string>
     <string name="mins">minuts</string>
     <string name="search_giphy">Cercar GIPHY</string>
-    <string name="generic_null_response">Response is null!</string>
-    <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="generic_null_response">La resposta és nul·la!</string>
+    <string name="generic_not_ok_response">L\'estat de la resposta no és correcte!</string>
+    <string name="generic_failed_request">La petició ha fallat!</string>
+    <string name="hint_keyword">Paraula clau</string>
+    <string name="toggle_keyword_filter">Activar el filtre de paraules clau</string>
+    <string name="edit_keyword_filter">Editar els filtres de paraules clau</string>
+    <string name="added_keywords">S\'ha afegit la paraula clau: %s a la llista de filtres</string>
+    <string name="removed_keywords">S\'ha eliminat la paraula clau: %s de la llista de filtres</string>
+    <string name="marked_as_seen">Marcat com a vist</string>
+    <string name="delete_unsuccessful">Suprimeix sense èxit</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Informe d\'error de Barinsta</string>
+    <string name="crash_report_title">Selecciona una aplicació de correu electrònic per enviar registres d\'error</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-cs/arrays.xml b/app/src/main/res/values-cs/arrays.xml
index 8d3ac1f8..2a36e922 100644
--- a/app/src/main/res/values-cs/arrays.xml
+++ b/app/src/main/res/values-cs/arrays.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="languages">
-        <item>Podle nastavení systému</item>
+        <item>Podle systému</item>
         <item translatable="false">English</item>
         <item translatable="false">Français</item>
         <item translatable="false">Español</item>
@@ -32,7 +32,7 @@
         <item>Světlý</item>
     </string-array>
     <string-array name="story_sorts">
-        <item>Výchozí chování Instagramu (nepřečteno pak přečteno)</item>
+        <item>Výchozí chování Instagramu (nepřečtené pak přečtené)</item>
         <item>Od nejnovějších po nejstarší</item>
         <item>Od nejstarších po nejnovější</item>
     </string-array>
@@ -44,8 +44,17 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
-        <item>secs</item>
-        <item>mins</item>
+        <item>sekundy</item>
+        <item>minuty</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0bb9e0ac..afdd3ee2 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -4,12 +4,12 @@
     <string name="action_dms">Přímé Zprávy</string>
     <string name="action_settings">Nastavení</string>
     <string name="action_download">Stáhnout</string>
-    <string name="action_search">Vyhledat uživatelské jméno…</string>
+    <string name="action_search">Hledat uživatele…</string>
     <string name="action_compare">Porovnat</string>
     <string name="clipboard_error">Chyba při kopírování textu</string>
     <string name="clipboard_copied">Zkopírováno do schránky!</string>
     <string name="report">Nahlásit</string>
-    <string name="set_password">Protect file with password</string>
+    <string name="set_password">Chránit soubor heslem</string>
     <string name="password_no_max">Heslo</string>
     <string name="ok">OK</string>
     <string name="yes">Ano</string>
@@ -21,21 +21,23 @@
     <string name="title_comments">Komentáře</string>
     <string name="title_notifications">Aktivita</string>
     <string name="update_check">Zkontrolovat aktualizace při spuštění</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">Blokovat snímky obrazovky a náhled aplikace</string>
     <string name="download_user_folder">Stáhnout příspěvky do složek s uživatelským jménem</string>
+    <string name="download_prepend_username">Připojit uživatelské jméno k názvu souboru</string>
     <string name="mark_as_seen_setting">Označit příběhy po zhlédnutí jako zobrazené</string>
-    <string name="mark_as_seen_setting_summary">Autor příběhu bude vědět, že jsi si ho zobrazili</string>
-    <string name="dm_mark_as_seen_setting">Označovat přímou zprávu po zobrazení jako zobrazenou</string>
+    <string name="mark_as_seen_setting_summary">Autor příběhu bude vědět, že jste si jej zobrazili</string>
+    <string name="hide_muted_reels_setting">Skrýt ztišené příběhy z kanálu</string>
+    <string name="dm_mark_as_seen_setting">Označovat zprávy po zhlédnutí jako zobrazené</string>
     <string name="dm_mark_as_seen_setting_summary">Ostatní členové uvidí, že jste si ji ji zobrazili</string>
     <string name="activity_setting">Povolit oznámení o aktivitě</string>
-    <string name="story_sort_setting">Řazení příběhů feedu</string>
-    <string name="error_loading_profile">Error loading profile! Is the username valid? If so, you may be ratelimited.</string>
-    <string name="error_loading_profile_loggedin">Error loading profile! Is the username valid? Or did they block you?</string>
-    <string name="error_loading_hashtag">Error loading hashtag! Is the name valid?</string>
-    <string name="error_loading_location">Error loading location! Is the URL valid?</string>
+    <string name="story_sort_setting">Řazení kanálu příběhů</string>
+    <string name="error_loading_profile">Chyba při načítání profilu! Je uživatelské jméno platné? Pokud ano, jste možná omezeni Instagramem.</string>
+    <string name="error_loading_profile_loggedin">Chyba při načítání profilu! Je uživatelské jméno platné? Nebo vás zablokovali?</string>
+    <string name="error_loading_hashtag">Chyba při načítání hashtagu! Je název platný?</string>
+    <string name="error_loading_location">Chyba při načítání polohy! Je URL platná?</string>
     <string name="error_creating_folders">Chyba při vytváření složky(ek) stahování.</string>
     <string name="save_to_folder">Uložit do vlastní složky</string>
-    <string name="select_folder">Vybrat adresář</string>
+    <string name="select_folder">Vybrat složku</string>
     <string name="theme_settings">Motiv</string>
     <string name="login_settings">Týká se pouze přihlášených uživatelů:</string>
     <string name="anonymous_settings">Týká se pouze anonymních uživatelů:</string>
@@ -54,16 +56,18 @@
     </plurals>
     <plurals name="main_posts_followers">
         <item quantity="one">%s\nSledující</item>
-        <item quantity="few">%s\nFollowers</item>
-        <item quantity="many">%s\nFollowers</item>
+        <item quantity="few">%s\nSledující</item>
+        <item quantity="many">%s\nSledujících</item>
         <item quantity="other">%s\nSledujících</item>
     </plurals>
     <string name="main_posts_following">%s\nSleduje</string>
     <string name="post_viewer_autoplay_video">Videa spouštět automaticky</string>
+    <string name="post_viewer_background_play">Pokračovat v přehrávání na pozadí</string>
+    <string name="post_viewer_background_play_summary">Nepozastavovat videa při opuštění aplikace</string>
     <string name="post_viewer_muted_autoplay">Vždy ztlumit videa</string>
-    <string name="post_viewer_show_captions">Vždy zobrazovat titulek příspěvku</string>
+    <string name="post_viewer_show_captions">Vždy zobrazovat popisek příspěvku</string>
     <string name="post_viewer_download_dialog_title">Vyberte, co stáhnout</string>
-    <string name="post_viewer_download_current">Současné</string>
+    <string name="post_viewer_download_current">Aktuální</string>
     <string name="post_viewer_download_album">Celé album</string>
     <string name="show_stories">Zobrazit příběhy</string>
     <string name="no_more_stories">Žádné další příběhy!</string>
@@ -73,10 +77,10 @@
     <string name="spotify">Spotify</string>
     <string name="vote_story_poll">Hlasovat</string>
     <string name="votef_story_poll">Hlasování úspěšné!</string>
-    <string name="voted_story_poll">Už jste hlasoval!</string>
+    <string name="voted_story_poll">Již jste hlasovali!</string>
     <string name="respond_story">Odpovědět</string>
     <string name="answer_hint">Odpovědět…</string>
-    <string name="answered_story">Odpověď byla úspěšná!</string>
+    <string name="answered_story">Odpověď úspěšně odeslána!</string>
     <plurals name="slider_info" comment="For slider stickers in stories, eg. 3 responses averaging 17.38%">
         <item quantity="one">%d odpověď, průměrně %s</item>
         <item quantity="few">%d odpovědí, průměrně %s</item>
@@ -99,37 +103,37 @@
     <string name="logout">Odhlásit se</string>
     <string name="logout_summary">Procházet Instagram anonymně</string>
     <string name="remove_all_acc">Odstranit všechny účty</string>
-    <string name="remove_all_acc_warning">Tato akce odstraní všechny přidané účty z aplikace!\nChcete-li odstranit jen jeden účet, dlouze ho podržte v přepínači účtů.\nChcete stále pokračovat?</string>
+    <string name="remove_all_acc_warning">Tato akce z aplikace odstraní všechny přidané účty!\nChcete-li odstranit jen jeden účet, dlouze ho podržte v přepínači účtů.\nChcete stále pokračovat?</string>
     <string name="time_settings">Formát data</string>
-    <string name="saved_create_collection">Create new collection</string>
-    <string name="edit_collection">Edit collection name</string>
-    <string name="delete_collection">Delete collection</string>
-    <string name="delete_collection_confirm">Are you sure you want to delete this collection?</string>
-    <string name="delete_collection_note">All contained media will remain in other collections.</string>
-    <string name="add_to_collection">Add to collection...</string>
-    <string name="remove_from_collection">Remove from collection</string>
-    <string name="liked">Oblíbené</string>
+    <string name="saved_create_collection">Vytvořit sbírku</string>
+    <string name="edit_collection">Upravit název sbírky</string>
+    <string name="delete_collection">Odstranit sbírku</string>
+    <string name="delete_collection_confirm">Opravdu chcete tuto sbírku odstranit?</string>
+    <string name="delete_collection_note">Všechna uložená média zůstanou v jiných sbírkách.</string>
+    <string name="add_to_collection">Přidat do sbírky...</string>
+    <string name="remove_from_collection">Odebrat ze sbírky</string>
+    <string name="liked">Líbí se</string>
     <string name="saved">Uložené</string>
     <string name="tagged">Označeno</string>
     <string name="dm_person">Zpráva</string>
     <string name="like_without_count">To se mi líbí</string>
     <string name="unlike_without_count">Už se mi to nelíbí</string>
     <string name="bookmark">Přidat do záložek</string>
-    <string name="unbookmark">Zrušit záložku</string>
+    <string name="unbookmark">Odebrat záložku</string>
     <string name="follow">Sledovat</string>
     <string name="unfollow">Přestat sledovat</string>
-    <string name="favorite_short" comment="Adjective, not verb">Přidat do oblíbených</string>
+    <string name="favorite_short" comment="Adjective, not verb">Oblíbené</string>
     <string name="block">Zablokovat</string>
     <string name="unblock">Odblokovat</string>
     <string name="restrict">Omezit</string>
     <string name="unrestrict">Zrušit omezení</string>
-    <string name="mute_stories">Mute stories</string>
-    <string name="mute_posts">Mute posts</string>
-    <string name="unmute_stories">Unmute stories</string>
-    <string name="unmute_posts">Unmute posts</string>
+    <string name="mute_stories">Ztlumit příběhy</string>
+    <string name="mute_posts">Ztlumit příspěvky</string>
+    <string name="unmute_stories">Zrušit ztlumení příběhů</string>
+    <string name="unmute_posts">Zrušit ztlumení příspěvků</string>
     <string name="bio_copy">Kopírovat bio</string>
     <string name="bio_translate">Přeložit bio</string>
-    <string name="status_mutual">vzájemní</string>
+    <string name="status_mutual">Vzájemní</string>
     <string name="status_following">Sleduje</string>
     <string name="status_follower">Sledující</string>
     <string name="map">Mapa</string>
@@ -142,42 +146,42 @@
     <string name="dialog_export_failed">Export se nezdařil!</string>
     <string name="refresh">Načíst znovu</string>
     <string name="get_cookies">Získat cookies</string>
-    <string name="desktop_2fa">Režim stolního počítače</string>
+    <string name="desktop_2fa">Režim počítače</string>
     <string name="time_settings_title_custom">Použít vlastní formát</string>
     <string name="time_settings_title_separator">Oddělovač</string>
     <string name="time_settings_title_time_format">Formát času</string>
-    <string name="time_settings_title_date_format">Formát datumu</string>
+    <string name="time_settings_title_date_format">Formát data</string>
     <string name="time_settings_title_preview">Náhled</string>
-    <string name="time_settings_swap_time">Prohodit pozice času a datumu</string>
+    <string name="time_settings_swap_time">Prohodit pozice času a data</string>
     <string name="quick_access_cannot_delete_curr">Nemůžete smazat aktuálně používaný účet</string>
     <string name="quick_access_confirm_delete">Opravdu chcete smazat \'%s\'?</string>
     <string name="open_profile">Otevřít profil</string>
     <string name="view_story">Zobrazit příběh</string>
-    <string name="view_pfp">Zobrazit profilovou fotku</string>
-    <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
+    <string name="view_pfp">Zobrazit obrázek profilu</string>
+    <string name="dms_inbox_raven_message_unknown">Nepodporovaný typ zprávy</string>
     <string name="dms_inbox_unsend">Zrušit odeslání zprávy</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
-    <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
-    <string name="dms_inbox_shared_image">%s shared an image</string>
-    <string name="dms_inbox_shared_video">%s shared a video</string>
-    <string name="dms_inbox_shared_message">%s sent a message</string>
-    <string name="dms_inbox_shared_gif">%s shared a gif</string>
-    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
-    <string name="dms_inbox_shared_profile">%s shared a profile: @%s</string>
-    <string name="dms_inbox_shared_location">%s shared a location: %s</string>
-    <string name="dms_inbox_shared_highlight">%s shared a story highlight by @%s</string>
-    <string name="dms_inbox_shared_story">%s shared a story by @%s</string>
-    <string name="dms_inbox_shared_voice">%s sent a voice message</string>
-    <string name="dms_inbox_shared_clip">%s shared a clip by @%s</string>
-    <string name="dms_inbox_shared_igtv">%s shared an IGTV video by @%s</string>
-    <string name="dms_inbox_replied_story_outgoing">You replied to their story: %s</string>
-    <string name="dms_inbox_replied_story_incoming">%s replied to your story: %s</string>
-    <string name="dms_inbox_reacted_story_outgoing">You reacted to their story: %s</string>
-    <string name="dms_inbox_reacted_story_incoming">%s reacted to your story: %s</string>
-    <string name="dms_inbox_mentioned_story_outgoing">You mentioned @%s in your story</string>
-    <string name="dms_inbox_mentioned_story_incoming">%s mentioned you in their story</string>
+    <string name="dms_inbox_giphy">Zobrazit na GIPHY</string>
+    <string name="dms_inbox_shared_post">%s sdílel(a) příspěvek od @%s</string>
+    <string name="dms_inbox_shared_image">%s sdílel(a) obrázek</string>
+    <string name="dms_inbox_shared_video">%s sdílel(a) video</string>
+    <string name="dms_inbox_shared_message">%s poslal(a) zprávu</string>
+    <string name="dms_inbox_shared_gif">%s sdílel(a) gif</string>
+    <string name="dms_inbox_shared_sticker">%s sdílel(a) nálepku</string>
+    <string name="dms_inbox_shared_profile">%s sdílel(a) profil: @%s</string>
+    <string name="dms_inbox_shared_location">%s sdílel(a) polohu: %s</string>
+    <string name="dms_inbox_shared_highlight">%s sdílel(a) zvýrazněný příběh od @%s</string>
+    <string name="dms_inbox_shared_story">%s sdílel(a) příběh od @%s</string>
+    <string name="dms_inbox_shared_voice">%s poslal(a) hlasovou zprávu</string>
+    <string name="dms_inbox_shared_clip">%s sdílel(a) sekvenci od @%s</string>
+    <string name="dms_inbox_shared_igtv">%s sdílel(a) IGTV video od @%s</string>
+    <string name="dms_inbox_replied_story_outgoing">Odpověděli jste na příběh: %s</string>
+    <string name="dms_inbox_replied_story_incoming">%s odpověděl(a) na váš příběh: %s</string>
+    <string name="dms_inbox_reacted_story_outgoing">Reagovali jste na příběh: %s</string>
+    <string name="dms_inbox_reacted_story_incoming">%s reagoval(a) na váš příběh: %s</string>
+    <string name="dms_inbox_mentioned_story_outgoing">Zmínili jste @%s ve svém příběhu</string>
+    <string name="dms_inbox_mentioned_story_incoming">%s vás zmínil(a) ve svém příběhu</string>
     <string name="dms_inbox_raven_media_unknown"><i>Neznámý typ médií</i></string>
-    <string name="dms_inbox_raven_media_expired">Média vypršela!</string>
+    <string name="dms_inbox_raven_media_expired">Platnost média vypršela!</string>
     <string name="dms_inbox_raven_media_delivered">Doručeno</string>
     <string name="dms_inbox_raven_media_sent">Odesláno</string>
     <string name="dms_inbox_raven_media_opened">Otevřeno</string>
@@ -188,22 +192,22 @@
     <string name="dms_inbox_raven_media_screenshot">Udělán snímek obrazovky</string>
     <string name="dms_inbox_raven_media_cant_deliver">Nelze doručit</string>
     <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
-    <string name="dms_thread_message_hint">Message...</string>
-    <string name="dms_thread_audio_hint">Press and hold to record audio</string>
-    <string name="dms_thread_updating">Updating...</string>
-    <string name="dms_action_leave">Leave chat</string>
+    <string name="dms_thread_message_hint">Zpráva...</string>
+    <string name="dms_thread_audio_hint">Stiskněte a podržte pro nahrávání</string>
+    <string name="dms_thread_updating">Aktualizace...</string>
+    <string name="dms_action_leave">Opustit chat</string>
     <string name="dms_action_leave_question">Chcete opustit tento chat?</string>
     <string name="dms_action_kick">Vyhodit</string>
     <string name="dms_left_users">Uživatelé, kteří skupinu opustili</string>
-    <string name="dms_ERROR_INVALID_USER">Invalid user</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_INVALID_USER">Neexistující uživatel</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram neumožňuje posílat ve zprávách videa delší než 60 sekund.</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram neumožňuje posílat ve zprávách zvuk delší než 60 sekund.</string>
     <string name="direct_download">Stáhnout přímo</string>
     <string name="direct_download_desc">Stahuje příspěvky přímo do telefonu!</string>
     <string name="direct_download_loading">Načítání příspěvků</string>
     <string name="downloader_complete">Stahování bylo dokončeno</string>
     <string name="downloader_downloading_post">Stahování příspěvku…</string>
-    <string name="downloader_downloading_media">Stahuji média</string>
+    <string name="downloader_downloading_media">Stahování médií</string>
     <string name="downloader_downloading_pfp">Stahování profilového obrázku</string>
     <string name="downloader_unknown_error">Vyskytla se neznámá chyba!</string>
     <string name="downloader_error_creating_folder">Chyba při vytváření složky!</string>
@@ -221,22 +225,22 @@
     <string name="comment_view_mention_hash_search">Chcete vyhledat hashtag?</string>
     <string name="followers_type_followers">Sledující</string>
     <string name="followers_type_following">Sleduje</string>
-    <string name="followers_compare">Porovnávaní sledovaných &amp; sledujících</string>
+    <string name="followers_compare">Porovnávaní sledovaných a sledujících</string>
     <string name="followers_both_following">Oba(ě) se navzájem sledují</string>
     <string name="followers_not_following">nesleduje %s</string>
     <string name="followers_not_follower">%s nesleduje</string>
     <string name="login_error_loading_cookies">Chyba při načítání souborů cookies</string>
     <string name="comment_hint">Napsat nový komentář…</string>
     <string name="dm_hint">Napsat novou zprávu…</string>
-    <string name="liked_notif">Líbí se mu Váš příspěvek</string>
-    <string name="comment_notif">Okomentoval Váš příspěvek:</string>
-    <string name="follow_notif">Vás začal sledovat</string>
-    <string name="tagged_notif">vás označil(a) v příspěvku</string>
+    <string name="liked_notif">Váš příspěvek se líbí</string>
+    <string name="comment_notif">Okomentoval(a) váš příspěvek:</string>
+    <string name="follow_notif">Vás začal(a) sledovat</string>
+    <string name="tagged_notif">Vás označil(a) v příspěvku</string>
     <string name="request_notif">Požádal(a) o sledování</string>
     <string name="request_approve">Schválit žádost</string>
     <string name="request_reject">Zamítnout žádost</string>
     <string name="share_public_post">Sdílejte tento veřejný příspěvek na…</string>
-    <string name="share_private_post">Toto je soukromý příspěvek! Sdílejte jej s těmi, kdo jej může vidět!</string>
+    <string name="share_private_post">Toto je soukromý příspěvek! Sdílejte jej s těmi, kdo jej mohou vidět!</string>
     <string name="discover_empty">Tato kategorie je nějak prázdná…</string>
     <string name="update_available">Je k dispozici aktualizace! (%s)</string>
     <string name="update_notice">Připomínka: Pokud jste aplikaci stáhli z F-Droidu, musíte ji z něj i aktualizovat! To stejné platí pro GitHub.</string>
@@ -254,13 +258,13 @@
     <string name="activity_count_commentlikes">%d lajků komentáře</string>
     <string name="activity_count_usertags">%d uživatelských štítků</string>
     <string name="activity_count_likes">%d se líbí</string>
-    <string name="activity_count_poy">%d photos of you</string>
-    <string name="activity_count_requests">%d follow requests</string>
+    <string name="activity_count_poy">%d fotek s vámi</string>
+    <string name="activity_count_requests">%d žádostí o sledování</string>
     <string name="activity_notloggedin">Odhlásili jste se před kliknutím na toto oznámení?</string>
-    <string name="feed">Feed</string>
+    <string name="feed">Kanál</string>
     <string name="profile">Profil</string>
     <string name="more">Více</string>
-    <string name="title_dm">DM</string>
+    <string name="title_dm">Zprávy</string>
     <string name="number_selected">%d vybráno</string>
     <string name="logout_success">Odhlášení proběhlo úspěšně!</string>
     <string name="dm_thread_info">Informace</string>
@@ -273,59 +277,59 @@
     <string name="pref_category_downloads">Stažené</string>
     <string name="pref_category_locale">Místní prostředí</string>
     <string name="account">Účet</string>
-    <string name="account_hint">Nejde se vám přihlásit? Prostě přidejte účet znovu.</string>
+    <string name="account_hint">Přestalo fungovat přihlášení? Jednoduše účet přidejte znovu.</string>
     <string name="add_account">Přidat účet</string>
     <string name="about_category_license">Licence (pouze anglicky)</string>
     <string name="about_documentation">Navštivte náš web</string>
     <string name="about_documentation_summary">Získejte podporu, diskutujte, setkávejte se s ostatními a bavte se!</string>
     <string name="about_repository">Podívejte se na náš zdrojový kód na GitHub</string>
-    <string name="about_repository_summary">Auditujte, označte hvězdou, nahlaste chyby, přispívejte a mějte zábava (znovu)!</string>
+    <string name="about_repository_summary">Auditujte, označte hvězdou, nahlaste chyby, přispívejte a bavte se (znovu)!</string>
     <string name="about_feedback">Poslat zpětnou vazbu e-mailem</string>
-    <string name="about_category_3pt">Atributy třetích stran</string>
+    <string name="about_category_3pt">Zdroje třetích stran</string>
     <string name="reminder">Upozornění</string>
     <string name="reminder_summary">Používejte tuto aplikaci odpovědně. Stažené obrázky by měly být použity pouze pro účely povolené platnými zákony.</string>
     <string name="light_white_theme">Bílá</string>
     <string name="dark_black_theme">Černá</string>
     <string name="light_theme_settings">Světlý vzhled</string>
     <string name="dark_theme_settings">Tmavý vzhled</string>
-    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Kávový</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Kávová</string>
     <string name="dark_material_dark_theme">Material Dark</string>
-    <string name="added_to_favs">Added to Favorites!</string>
-    <string name="add_to_favorites">Add to Favorites</string>
+    <string name="added_to_favs">Přidáno do Oblíbených!</string>
+    <string name="add_to_favorites">Přidat do Oblíbených</string>
     <string name="accounts">Účty</string>
     <string name="hashtags">Hashtagy</string>
     <string name="locations">Místa</string>
     <string name="unknown">Neznámý</string>
-    <string name="removed_from_favs">Removed from Favourites!</string>
-    <string name="backup_and_restore">Backup &amp; Restore</string>
-    <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
-    <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>
-    <string name="create_backup">Vytvořit nový soubor zálohy</string>
+    <string name="removed_from_favs">Odebráno z Oblíbených!</string>
+    <string name="backup_and_restore">Záloha a obnovení</string>
+    <string name="backup_summary">Zálohujte nastavení aplikace Barinsta, přihlašovací údaje a/nebo oblíbené položky do prostého textu nebo šifrovaného souboru pro pozdější obnovu.</string>
+    <string name="backup_warning">Pokud zálohujete přihlašovací údaje, zacházejte se souborem jako s důvěrným a uchovejte ho bezpečně!</string>
+    <string name="create_backup">Vytvořit novou zálohu</string>
     <string name="restore_backup">Obnovit z existující zálohy</string>
     <string name="file_chosen_label">Soubor:</string>
     <string name="enter_password">Zadejte heslo</string>
     <string name="select_backup_file">Vyberte soubor zálohy (.zaai/.backup)</string>
     <string name="apply">Použít</string>
     <string name="save">Uložit</string>
-    <string name="caption">Titulek</string>
-    <string name="edit_caption">Edit caption</string>
-    <string name="translate_caption">Translate caption</string>
+    <string name="caption">Popisek</string>
+    <string name="edit_caption">Upravit popisek</string>
+    <string name="translate_caption">Přeložit popisek</string>
     <string name="player_timeline_desc">Časová osa přehrávače videa</string>
-    <string name="liking">Označuji jako oblíbené…</string>
+    <string name="liking">Lajkování…</string>
     <string name="like_unsuccessful">Lajkování bylo neúspěšné</string>
-    <string name="unlike_unsuccessful">Odstraňování lajku bylo neúspěšné</string>
-    <string name="unliking">Odstraňuji označení jako oblíbené…</string>
+    <string name="unlike_unsuccessful">Odebírání lajku bylo neúspěšné</string>
+    <string name="unliking">Odebírání lajku…</string>
     <string name="controls">Ovládací prvky</string>
     <string name="saving">Ukládání…</string>
     <string name="removing">Odstraňování…</string>
     <string name="save_unsuccessful">Uložení se nezdařilo</string>
     <string name="save_remove_unsuccessful">Odstranění se nezdařilo</string>
-    <string name="downloading">Stahuji…</string>
-    <string name="downloader_downloading_child">Download item %1$d of %2$d</string>
-    <string name="delete">Vymazat</string>
+    <string name="downloading">Stahování…</string>
+    <string name="downloader_downloading_child">Stahuje se %1$d z %2$d</string>
+    <string name="delete">Smazat</string>
     <string name="comment">Komentovat</string>
     <string name="layout">Rozložení</string>
-    <string name="feed_stories">Feed příběhů</string>
+    <string name="feed_stories">Kanál příběhů</string>
     <string name="opening_post">Otevírání příspěvku...</string>
     <string name="share">Sdílet</string>
     <string name="layout_style">Styl rozložení</string>
@@ -339,34 +343,34 @@
     <string name="show_grid_gap">Zobrazit mezery v mřížce</string>
     <string name="disable_animation">Zakázat animace</string>
     <string name="follower_wait_to_load">Počkejte prosím nejdříve na dokončení aktuální úlohy!</string>
-    <string name="follower_start_compare">V závislosti na počtu uživatelů to může chvíli trvat. Buďte trpěliví.</string>
+    <string name="follower_start_compare">V závislosti na počtu uživatelů to může chvíli trvat. Buďte prosím trpěliví.</string>
     <string name="post_not_found">Příspěvek nebyl nalezen!</string>
     <string name="no_external_app_url">Nebyla nalezena žádná aplikace, která by otevřela URL</string>
-    <string name="gallery">Gallery</string>
-    <string name="camera">Camera</string>
-    <string name="all_photos">All Photos</string>
-    <string name="all_media">All Media</string>
-    <string name="all_videos">All Videos</string>
-    <string name="brightness">Brightness</string>
-    <string name="contrast">Contrast</string>
-    <string name="vibrance">Vibrance</string>
-    <string name="saturation">Saturation</string>
-    <string name="sharpen">Sharpen</string>
-    <string name="exposure">Exposure</string>
-    <string name="center">Center</string>
-    <string name="color">Color</string>
-    <string name="start">Start</string>
-    <string name="end">End</string>
-    <string name="bilateral_blur">Bilateral Blur</string>
-    <string name="vignette">Vignette</string>
-    <string name="box_blur">Box blur</string>
-    <string name="sepia">Sepia</string>
+    <string name="gallery">Galerie</string>
+    <string name="camera">Fotoaparát</string>
+    <string name="all_photos">Všechny fotografie</string>
+    <string name="all_media">Všechna média</string>
+    <string name="all_videos">Všechna videa</string>
+    <string name="brightness">Jas</string>
+    <string name="contrast">Kontrast</string>
+    <string name="vibrance">Živost</string>
+    <string name="saturation">Saturace</string>
+    <string name="sharpen">Zaostření</string>
+    <string name="exposure">Expozice</string>
+    <string name="center">Střed</string>
+    <string name="color">Barva</string>
+    <string name="start">Začátek</string>
+    <string name="end">Konec</string>
+    <string name="bilateral_blur">Bilaterální rozostření</string>
+    <string name="vignette">Vinětace</string>
+    <string name="box_blur">Hranaté rozmazání</string>
+    <string name="sepia">Sépie</string>
     <string name="clarendon">Clarendon</string>
     <string name="one977">1977</string>
     <string name="aden">Aden</string>
-    <string name="reset">Reset</string>
-    <string name="crop">Crop</string>
-    <string name="normal">Normal</string>
+    <string name="reset">Obnovit</string>
+    <string name="crop">Oříznout</string>
+    <string name="normal">Normální</string>
     <plurals name="likes_count">
         <item quantity="one">%d se líbí</item>
         <item quantity="few">%d se líbí</item>
@@ -380,10 +384,10 @@
         <item quantity="other">%d komentářů</item>
     </plurals>
     <plurals name="views_count">
-        <item quantity="one">%d view</item>
-        <item quantity="few">%d views</item>
-        <item quantity="many">%d views</item>
-        <item quantity="other">%d views</item>
+        <item quantity="one">%d zobrazení</item>
+        <item quantity="few">%d zobrazení</item>
+        <item quantity="many">%d zobrazení</item>
+        <item quantity="other">%d zobrazení</item>
     </plurals>
     <plurals name="stories_count">
         <item quantity="one">%s příběh</item>
@@ -392,87 +396,108 @@
         <item quantity="other">%s příběhů</item>
     </plurals>
     <string name="download_permission">Přístup k úložišti nebyl udělen!</string>
-    <string name="details">Details</string>
-    <string name="title">Title</string>
-    <string name="members">Members</string>
-    <string name="admin">Admin</string>
-    <string name="inviter">Inviter</string>
-    <string name="mute_messages">Mute messages</string>
-    <string name="mute_mentions">Mute mentions</string>
-    <string name="add_members">Add members</string>
-    <string name="search">Search</string>
-    <string name="done">Done</string>
-    <string name="dms_action_make_admin">Make Admin</string>
-    <string name="dms_action_remove_admin">Remove as Admin</string>
-    <string name="edit_unsuccessful">Edit was unsuccessful</string>
-    <string name="message">Message</string>
-    <string name="reply">Reply</string>
-    <string name="tap_to_remove">Tap to remove</string>
-    <string name="forward">Forward</string>
-    <string name="forward_outgoing">You forwarded a message</string>
-    <string name="forward_incoming">Forwarded a message</string>
-    <string name="add">Add</string>
-    <string name="send">Send</string>
-    <string name="replying_to_yourself">Replying to yourself</string>
-    <string name="replying_to_user">Replying to %s</string>
-    <string name="replied_to_yourself">You replied to yourself</string>
-    <string name="replied_you">You replied</string>
-    <string name="replied_you_group">You replied to %s</string>
-    <string name="replied_group">Replied to %s</string>
-    <string name="replied_to_you">Replied to you</string>
-    <string name="replied_to_themself">Replied to themself</string>
-    <string name="reacted_story_outgoing">You reacted to their story</string>
-    <string name="reacted_story_incoming">Reacted to your story</string>
-    <string name="mentioned_story_outgoing">You mentioned them in your story</string>
-    <string name="mentioned_story_incoming">Mentioned you in their story</string>
-    <string name="replied_story_outgoing">You replied to their story</string>
-    <string name="replied_story_incoming">Replied to your story</string>
-    <string name="raven_image_expired">Image has expired</string>
-    <string name="raven_image_info">Image will expire when seen</string>
-    <string name="raven_video_expired">Video has expired</string>
-    <string name="raven_video_info">Video will expire when seen</string>
-    <string name="raven_msg_expired">Message has expired</string>
-    <string name="raven_msg_info">Message will expire when seen</string>
-    <string name="story_share">\@%s\'s story</string>
-    <string name="story_share_highlight">\@%s\'s story highlight</string>
-    <string name="photo">Photo</string>
+    <string name="details">Podrobnosti</string>
+    <string name="title">Název</string>
+    <string name="members">Členové</string>
+    <string name="admin">Správce</string>
+    <string name="inviter">Hostitel</string>
+    <string name="mute_messages">Ztišit zprávy</string>
+    <string name="mute_mentions">Ztišit zmínky</string>
+    <string name="add_members">Přidat členy</string>
+    <string name="search">Hledat</string>
+    <string name="done">Hotovo</string>
+    <string name="dms_action_make_admin">Učinit správcem</string>
+    <string name="dms_action_remove_admin">Odebrat jako správce</string>
+    <string name="edit_unsuccessful">Úprava se nezdařila</string>
+    <string name="message">Zpráva</string>
+    <string name="reply">Odpověď</string>
+    <string name="tap_to_remove">Klepnutím odebrat</string>
+    <string name="forward">Přeposlat</string>
+    <string name="forward_outgoing">Přeposlali jste zprávu</string>
+    <string name="forward_incoming">Přeposlal(a) zprávu</string>
+    <string name="add">Přidat</string>
+    <string name="send">Odeslat</string>
+    <string name="replying_to_yourself">Odpovídáte sobě</string>
+    <string name="replying_to_user">Odpovídá na %s</string>
+    <string name="replied_to_yourself">Odpověděli jste sami sobě</string>
+    <string name="replied_you">Odpověděli jste</string>
+    <string name="replied_you_group">Odpověděli jste %s</string>
+    <string name="replied_group">Odpovídá %s</string>
+    <string name="replied_to_you">Odpověděl(a) vám</string>
+    <string name="replied_to_themself">Odpověděli sami sobě</string>
+    <string name="reacted_story_outgoing">Reagovali jste na jejich příběh</string>
+    <string name="reacted_story_incoming">Reagoval(a) na váš příběh</string>
+    <string name="mentioned_story_outgoing">Zmínili jste je ve svém příběhu</string>
+    <string name="mentioned_story_incoming">Zmínili vás ve svém příběhu</string>
+    <string name="replied_story_outgoing">Odpověděli jste na jejich příběh</string>
+    <string name="replied_story_incoming">Odpověděli na váš příběh</string>
+    <string name="raven_image_expired">Platnost obrázku vypršela</string>
+    <string name="raven_image_info">Obrázek zmizí po zobrazení</string>
+    <string name="raven_video_expired">Platnost videa vypršela</string>
+    <string name="raven_video_info">Video zmizí po zobrazení</string>
+    <string name="raven_msg_expired">Platnost zprávy vypršela</string>
+    <string name="raven_msg_info">Zpráva zmizí po zobrazení</string>
+    <string name="story_share">Příběh @%s</string>
+    <string name="story_share_highlight">Zvýrazněný příběh @%s</string>
+    <string name="photo">Fotka</string>
     <string name="video">Video</string>
-    <string name="voice_message">Voice message</string>
-    <string name="post">Post</string>
-    <string name="approval_required_for_new_members">Approval required to join</string>
-    <string name="requests">Requests</string>
-    <string name="admins_only">Admins only</string>
-    <string name="added_by">Added by %s</string>
-    <string name="admin_approval_required">Admin approval required</string>
-    <string name="admin_approval_required_description">An admin approval will be required to add new members to the group</string>
-    <string name="dms_action_end">End chat</string>
-    <string name="dms_action_end_question">End chat?</string>
-    <string name="dms_action_end_description">All members will be removed from the group. They will still be able to view the chat history.</string>
-    <string name="pending_requests">Pending Requests</string>
-    <string name="accept_request_from_user">Accept request from %1s (%2s)?</string>
-    <string name="decline">Decline</string>
-    <string name="accept">Accept</string>
-    <string name="you">You</string>
-    <string name="no_pending_requests">No pending requests</string>
-    <string name="checking_for_new_messages">Checking for new messages</string>
-    <string name="pref_category_stories">Stories</string>
-    <string name="pref_category_dm">DM</string>
-    <string name="pref_category_notifications">Notifications</string>
-    <string name="pref_category_post">Post</string>
-    <string name="enable_dm_notifications">Enable DM notifications</string>
-    <string name="enable_dm_auto_refesh">Auto refresh messages</string>
-    <string name="auto_refresh_every">Auto refresh every</string>
-    <string name="secs">secs</string>
-    <string name="mins">mins</string>
-    <string name="search_giphy">Search GIPHY</string>
+    <string name="voice_message">Hlasová zpráva</string>
+    <string name="post">Příspěvek</string>
+    <string name="approval_required_for_new_members">K připojení je nutné schválení</string>
+    <string name="requests">Žádosti</string>
+    <string name="admins_only">Pouze správci</string>
+    <string name="added_by">Přidal(a) %s</string>
+    <string name="admin_approval_required">Vyžadováno schválení správcem</string>
+    <string name="admin_approval_required_description">Pro přidání nových členů do skupiny bude vyžadováno schválení správcem</string>
+    <string name="dms_action_end">Ukončit chat</string>
+    <string name="dms_action_end_question">Ukončit chat?</string>
+    <string name="dms_action_end_description">Všichni členové budou odebráni ze skupiny. Stále budou moci zobrazit historii konverzace.</string>
+    <string name="pending_requests">Nevyřízené žádosti</string>
+    <string name="accept_request_from_user">Přijmout žádost od %1s (%2s)?</string>
+    <string name="decline">Odmítnout</string>
+    <string name="accept">Přijmout</string>
+    <string name="you">Vy</string>
+    <string name="no_pending_requests">Žádné nevyřízené žádosti</string>
+    <string name="checking_for_new_messages">Zjišťování nových zpráv</string>
+    <string name="pref_category_stories">Příběhy</string>
+    <string name="pref_category_dm">Zprávy</string>
+    <string name="pref_category_notifications">Upozornění</string>
+    <string name="pref_category_post">Příspěvky</string>
+    <string name="enable_dm_notifications">Zapnout upozornění na zprávy</string>
+    <string name="enable_dm_auto_refesh">Automaticky obnovovat zprávy</string>
+    <string name="auto_refresh_every">Automaticky obnovit každé</string>
+    <string name="secs">sekundy</string>
+    <string name="mins">minuty</string>
+    <string name="search_giphy">Prohledat GIPHY</string>
     <string name="generic_null_response">Response is null!</string>
-    <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="generic_not_ok_response">Stav odpovědi není v pořádku!</string>
+    <string name="generic_failed_request">Žádost selhala!</string>
+    <string name="hint_keyword">Klíčové slovo</string>
+    <string name="toggle_keyword_filter">Povolit filtr klíčových slov</string>
+    <string name="edit_keyword_filter">Upravit filtry klíčových slov</string>
+    <string name="added_keywords">Přidáno klíčové slovo: %s na seznam filtrovaných</string>
+    <string name="removed_keywords">Odstraněno klíčové slovo: %s ze seznamu filtrovaných</string>
+    <string name="marked_as_seen">Označeno jako zobrazené</string>
+    <string name="delete_unsuccessful">Odstranění se nezdařilo</string>
+    <string name="throttle_error">Omezeno Instagramem kvůli příliš mnoha požadavkům na API. Před dalším pokusem nějakou dobu počkejte.</string>
+    <string name="error">Chyba</string>
+    <string name="account_logged_out">Tento účet byl odhlášen.</string>
+    <string name="login_required">Vyžadováno přihlášení!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">Uživatel je neaktivní!</string>
+    <string name="crash_report_subject">Hlášení o pádu Barinsta</string>
+    <string name="crash_report_title">Vyberte aplikaci e-mailu pro odeslání protokolů o selhání</string>
+    <string name="not_found">Nenalezeno!</string>
+    <string name="rate_limit">Vaše IP adresa byla omezena Instagramem. Počkejte hodinu a zkuste to znovu.</string>
+    <string name="skip_update">Přeskočit tuto aktualizaci</string>
+    <string name="on_latest_version">Již máte nejnovější verzi</string>
+    <string name="tab_order">Pořadí obrazovek</string>
+    <string name="other_tabs">Další karty</string>
+    <string name="tab_order_start_next_launch">Nové pořadí karet se projeví při příštím spuštění</string>
+    <string name="dm_remove_warning">Po uložení budou při příštím spuštění vypnuty všechny funkce související s posíláním zpráv</string>
+    <string name="copy_caption">Kopírovat popisek</string>
+    <string name="copy_reply">Kopírovat odpověď</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-de/arrays.xml b/app/src/main/res/values-de/arrays.xml
index c36bdbcb..77ce0c18 100644
--- a/app/src/main/res/values-de/arrays.xml
+++ b/app/src/main/res/values-de/arrays.xml
@@ -44,8 +44,17 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
-        <item>secs</item>
-        <item>mins</item>
+        <item>Sek.</item>
+        <item>Min.</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1f541fcd..e79dcd1b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_about">Über</string>
-    <string name="action_dms">Direktnachrichten</string>
+    <string name="action_dms">Private Nachrichten</string>
     <string name="action_settings">Einstellungen</string>
     <string name="action_download">Herunterladen</string>
     <string name="action_search">Benutzernamen suchen…</string>
@@ -9,7 +9,7 @@
     <string name="clipboard_error">Fehler beim Kopieren des Textes</string>
     <string name="clipboard_copied">In die Zwischenablage kopiert!</string>
     <string name="report">Melden</string>
-    <string name="set_password">Protect file with password</string>
+    <string name="set_password">Datei mit Passwort schützen</string>
     <string name="password_no_max">Passwort</string>
     <string name="ok">OK</string>
     <string name="yes">Ja</string>
@@ -20,16 +20,18 @@
     <string name="title_discover">Entdecken</string>
     <string name="title_comments">Kommentare</string>
     <string name="title_notifications">Aktivität</string>
-    <string name="update_check">Beim Start auf Aktualisierungen prüfen</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="update_check">Beim Start auf Updates prüfen</string>
+    <string name="flag_secure">Bildschirmfotos &amp; App-Voschau verhindern</string>
     <string name="download_user_folder">Beiträge in Benutzernamen-Ordner herunterladen</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Stories nach dem Ansehen als gesehen markieren</string>
     <string name="mark_as_seen_setting_summary">Die Person wird wissen, dass du dir die Story angesehen hast</string>
+    <string name="hide_muted_reels_setting">Stummgeschaltete Stories im Feed ausblenden</string>
     <string name="dm_mark_as_seen_setting">Direktnachrichten nach dem Ansehen als gesehen markieren</string>
     <string name="dm_mark_as_seen_setting_summary">Andere Mitglieder werden wissen, dass du sie gesehen hast</string>
     <string name="activity_setting">Aktivitätsbenachrichtigungen aktivieren</string>
     <string name="story_sort_setting">Sortierung Storyfeed</string>
-    <string name="error_loading_profile">Fehler beim Laden des Profils! Ist der Benutzername gültig? Wenn ja, könnte es sein, dass Ihre Zugriffe begrenzt werden.</string>
+    <string name="error_loading_profile">Fehler beim Laden des Profils! Ist der Benutzername gültig? Wenn ja, könnte es sein, dass deine Zugriffe begrenzt werden.</string>
     <string name="error_loading_profile_loggedin">Fehler beim Laden des Profils! Ist der Benutzername gültig? Oder haben sie dich blockiert?</string>
     <string name="error_loading_hashtag">Fehler beim Laden des Hashtags! Ist der Name gültig?</string>
     <string name="error_loading_location">Fehler beim Laden der Position! Ist die URL gültig?</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nAbonniert</string>
     <string name="post_viewer_autoplay_video">Videos automatisch abspielen</string>
+    <string name="post_viewer_background_play">Videos im Hintergrund fortführen</string>
+    <string name="post_viewer_background_play_summary">Videos nicht pausieren, wenn die App nicht aktiv ist</string>
     <string name="post_viewer_muted_autoplay">Videos immer stummschalten</string>
     <string name="post_viewer_show_captions">Bildtext immer anzeigen</string>
     <string name="post_viewer_download_dialog_title">Datei zum Download auswählen</string>
@@ -62,8 +66,8 @@
     <string name="show_stories">Stories anzeigen</string>
     <string name="no_more_stories">Keine Stories mehr!</string>
     <string name="be_patient">Sei etwas geduldig!</string>
-    <string name="view_story_post">Post anzeigen</string>
-    <string name="view_post">Post anzeigen</string>
+    <string name="view_story_post">Beitrag anzeigen</string>
+    <string name="view_post">Beitrag anzeigen</string>
     <string name="spotify">Spotify</string>
     <string name="vote_story_poll">Abstimmung</string>
     <string name="votef_story_poll">Abstimmung erfolgreich!</string>
@@ -96,7 +100,7 @@
     <string name="saved_create_collection">Neue Sammlung anlegen</string>
     <string name="edit_collection">Sammlungsname bearbeiten</string>
     <string name="delete_collection">Sammlung löschen</string>
-    <string name="delete_collection_confirm">Sind Sie sicher, dass Sie diese Sammlung löschen möchten?</string>
+    <string name="delete_collection_confirm">Bist du sicher, dass du diese Sammlung löschen möchtest?</string>
     <string name="delete_collection_note">Alle enthaltenen Medien werden in anderen Sammlungen verbleiben.</string>
     <string name="add_to_collection">Zu Sammlung hinzufügen...</string>
     <string name="remove_from_collection">Aus Sammlung entfernen</string>
@@ -115,10 +119,10 @@
     <string name="unblock">Nicht mehr blockieren</string>
     <string name="restrict">Einschränken</string>
     <string name="unrestrict">Nicht mehr einschränken</string>
-    <string name="mute_stories">Mute stories</string>
-    <string name="mute_posts">Mute posts</string>
-    <string name="unmute_stories">Unmute stories</string>
-    <string name="unmute_posts">Unmute posts</string>
+    <string name="mute_stories">Stories stummschalten</string>
+    <string name="mute_posts">Beiträge stummschalten</string>
+    <string name="unmute_stories">Stummschaltung von Stories aufheben</string>
+    <string name="unmute_posts">Stummschaltung von Beiträgen aufheben</string>
     <string name="bio_copy">Steckbrief kopieren</string>
     <string name="bio_translate">Steckbrief übersetzen</string>
     <string name="status_mutual">Gegenseitig</string>
@@ -148,7 +152,7 @@
     <string name="view_pfp">Profilbild ansehen</string>
     <string name="dms_inbox_raven_message_unknown">Nicht unterstützter Nachrichtentyp</string>
     <string name="dms_inbox_unsend">Nachricht zurückrufen</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
+    <string name="dms_inbox_giphy">Auf GIPHY ansehen</string>
     <string name="dms_inbox_shared_post">%s hat einen Beitrag von @%s geteilt</string>
     <string name="dms_inbox_shared_image">%s hat ein Bild geteilt</string>
     <string name="dms_inbox_shared_video">%s hat ein Video geteilt</string>
@@ -187,9 +191,9 @@
     <string name="dms_action_leave_question">Chat verlassen?</string>
     <string name="dms_action_kick">Entfernen</string>
     <string name="dms_left_users">Ehemalige Benutzer</string>
-    <string name="dms_ERROR_INVALID_USER">Invalid user</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_INVALID_USER">Ungültiger Benutzer</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram erlaubt das Hochladen von Videos, die länger als 60 Sek. sind, nicht für PN.</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram erlaubt das Hochladen von Audiodateien, die länger als 60 Sek. sind, nicht.</string>
     <string name="direct_download">Direkt herunterladen</string>
     <string name="direct_download_desc">Lade Posts direkt auf das Handy herunter!</string>
     <string name="direct_download_loading">Beiträgen abrufen</string>
@@ -282,14 +286,14 @@
     <string name="dark_theme_settings">Dunkles Theme</string>
     <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
     <string name="dark_material_dark_theme">Material Dark</string>
-    <string name="added_to_favs">Added to Favorites!</string>
-    <string name="add_to_favorites">Add to Favorites</string>
+    <string name="added_to_favs">Zu Favoriten hinzugefügt!</string>
+    <string name="add_to_favorites">Zu Favoriten hinzufügen</string>
     <string name="accounts">Konten</string>
     <string name="hashtags">Hashtags</string>
     <string name="locations">Standorte</string>
     <string name="unknown">Unbekannt</string>
-    <string name="removed_from_favs">Removed from Favourites!</string>
-    <string name="backup_and_restore">Backup &amp; Restore</string>
+    <string name="removed_from_favs">Aus Favoriten entfernt!</string>
+    <string name="backup_and_restore">Sichern &amp; Wiederherstellen</string>
     <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
     <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>
     <string name="create_backup">Erstelle neue Sicherungsdatei</string>
@@ -416,7 +420,7 @@
     <string name="raven_video_expired">Video ist abgelaufen</string>
     <string name="raven_video_info">Video verfällt sobald es angesehen wurde</string>
     <string name="raven_msg_expired">Nachricht ist abgelaufen</string>
-    <string name="raven_msg_info">Nachricht verfällt sobald sie angesehen wurde</string>
+    <string name="raven_msg_info">Nachricht verfällt, sobald sie gesehen wird</string>
     <string name="story_share">\@%s\'s Story</string>
     <string name="story_share_highlight">\@%s\'s Story Highlight</string>
     <string name="photo">Foto</string>
@@ -437,26 +441,47 @@
     <string name="decline">Ablehnen</string>
     <string name="accept">Aktzeptieren</string>
     <string name="you">Du</string>
-    <string name="no_pending_requests">No pending requests</string>
+    <string name="no_pending_requests">Keine ausstehenden Anfragen</string>
     <string name="checking_for_new_messages">Checking for new messages</string>
     <string name="pref_category_stories">Stories</string>
-    <string name="pref_category_dm">DM</string>
-    <string name="pref_category_notifications">Notifications</string>
-    <string name="pref_category_post">Post</string>
-    <string name="enable_dm_notifications">Enable DM notifications</string>
+    <string name="pref_category_dm">PN</string>
+    <string name="pref_category_notifications">Benachrichtigungen</string>
+    <string name="pref_category_post">Beitrag</string>
+    <string name="enable_dm_notifications">PN-Benachrichtigungen aktivieren</string>
     <string name="enable_dm_auto_refesh">Auto refresh messages</string>
     <string name="auto_refresh_every">Auto refresh every</string>
-    <string name="secs">secs</string>
-    <string name="mins">mins</string>
-    <string name="search_giphy">Search GIPHY</string>
+    <string name="secs">Sek.</string>
+    <string name="mins">Min.</string>
+    <string name="search_giphy">GIPHY durchsuchen</string>
     <string name="generic_null_response">Response is null!</string>
     <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
+    <string name="generic_failed_request">Anfrage fehlgeschlagen!</string>
     <string name="hint_keyword">Keyword</string>
     <string name="toggle_keyword_filter">Enable keyword filter</string>
     <string name="edit_keyword_filter">Edit keyword filters</string>
     <string name="added_keywords">Added keyword: %s to filter list</string>
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="marked_as_seen">Als gesehen markieren</string>
+    <string name="delete_unsuccessful">Löschen fehlgeschlagen</string>
+    <string name="throttle_error">Aufgrund von zu vielen API-Anfragen von Instagram gedrosselt. Warte eine Zeit lang, bevor du es erneut versuchst.</string>
+    <string name="error">Fehler</string>
+    <string name="account_logged_out">Dieses Konto wurde abgemeldet.</string>
+    <string name="login_required">Anmeldung erforderlich!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">Benutzer ist inaktiv!</string>
+    <string name="crash_report_subject">Barinsta Absturzbericht</string>
+    <string name="crash_report_title">Wähle eine E-Mail-App zum Senden von Absturzprotokollen</string>
+    <string name="not_found">Nicht gefunden!</string>
+    <string name="rate_limit">Instagram hat die Zugriffe mit deiner IP begrenzt. Warte eine Stunde lang und versuche es erneut.</string>
+    <string name="skip_update">Dieses Update überspringen</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Reihenfolge der Anzeige</string>
+    <string name="other_tabs">Andere Registerkarten</string>
+    <string name="tab_order_start_next_launch">Die Reihenfolge der Registerkarten wird beim nächsten Start übernommen</string>
+    <string name="dm_remove_warning">Wenn übernommen, werden alle PN-bezogenen Funktionen beim nächsten Start deaktiviert</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-el/arrays.xml b/app/src/main/res/values-el/arrays.xml
index 0dd3a31e..73e78c08 100644
--- a/app/src/main/res/values-el/arrays.xml
+++ b/app/src/main/res/values-el/arrays.xml
@@ -32,18 +32,27 @@
         <item>Φωτεινό</item>
     </string-array>
     <string-array name="story_sorts">
-        <item>Προεπιλεγμένο του Instagram(Αδιάβαστο και μετά διαβασμένο)</item>
+        <item>Προεπιλογή του Instagram (Μη αναγνωσμένα και μετά αναγνωσμένα)</item>
         <item>Από το νεότερο στο παλαιότερο</item>
         <item>Από το παλαιότερο στο νεότερο</item>
     </string-array>
     <string-array name="separator_presets">
         <item>Κανένα</item>
         <item>\@</item>
-        <item>στο</item>
-        <item>πάνω</item>
+        <item>στις</item>
+        <item>την</item>
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>δεύτερα</item>
         <item>λεπτά</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f9817a0a..f1349a66 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_about">Σχετικά με</string>
-    <string name="action_dms">Απευθείας Μηνύματα</string>
+    <string name="action_dms">Μηνύματα</string>
     <string name="action_settings">Ρυθμίσεις</string>
     <string name="action_download">Λήψη</string>
-    <string name="action_search">Αναζήτηση ονόματος χρήστη...</string>
+    <string name="action_search">Αναζήτηση ονόματος χρήστη…</string>
     <string name="action_compare">Σύγκριση</string>
     <string name="clipboard_error">Σφάλμα κατά την αντιγραφή κειμένου</string>
-    <string name="clipboard_copied">Αντιγράφηκε στο clipboard!</string>
+    <string name="clipboard_copied">Αντιγράφηκε στο πρόχειρο!</string>
     <string name="report">Αναφορά</string>
     <string name="set_password">Προστασία αρχείου με κωδικό πρόσβασης</string>
     <string name="password_no_max">Κωδικός Πρόσβασης</string>
@@ -20,25 +20,27 @@
     <string name="title_discover">Ανακαλύψτε</string>
     <string name="title_comments">Σχόλια</string>
     <string name="title_notifications">Δραστηριότητα</string>
-    <string name="update_check">Έλεγχος για ενημερώσεις στο ξεκίνημα</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
-    <string name="download_user_folder">Λήψη δημοσίευσης στους φακέλους με ονόματα χρηστών</string>
+    <string name="update_check">Έλεγχος για ενημερώσεις κατά την εκκίνηση</string>
+    <string name="flag_secure">Παρεμπόδιση στιγμιοτύπων οθόνης &amp; προεπισκόπησης εφαρμογής</string>
+    <string name="download_user_folder">Λήψη δημοσιεύσεων σε φακέλους ονομάτων χρηστών</string>
+    <string name="download_prepend_username">Προσθέστε το όνομα χρήστη πριν από το όνομα του αρχείου</string>
     <string name="mark_as_seen_setting">Επισήμανση ιστοριών ως προβληθέντων μετά την προβολή</string>
-    <string name="mark_as_seen_setting_summary">Ο συντάκτης της ιστορίας θα ξέρει ότι την προβάλατε</string>
-    <string name="dm_mark_as_seen_setting">Σήμανση ΠΜ ως αναγνωσμένου μετά την προβολή</string>
-    <string name="dm_mark_as_seen_setting_summary">Άλλα μέλη θα γνωρίζουν πως το προβάλατε</string>
+    <string name="mark_as_seen_setting_summary">Ο δημιουργός της ιστορίας θα γνωρίζει ότι προβλήθηκε</string>
+    <string name="hide_muted_reels_setting">Απόκρυψη ιστοριών που βρίσκονται σε σίγαση από τη ροή</string>
+    <string name="dm_mark_as_seen_setting">Επισήμανση μηνυμάτων ως αναγνωσμένων μετά την προβολή</string>
+    <string name="dm_mark_as_seen_setting_summary">Τα υπόλοιπα μέλη θα γνωρίζουν ότι προβλήθηκε</string>
     <string name="activity_setting">Ενεργοποίηση ειδοποιήσεων δραστηριότητας</string>
     <string name="story_sort_setting">Ταξινόμηση ροής ιστορίων</string>
-    <string name="error_loading_profile">Σφάλμα κατά τη φόρτωση προφίλ! Είναι έγκυρο το όνομα χρήστη; Αν ναι, μπορεί να είστε περιορισμένοι.</string>
-    <string name="error_loading_profile_loggedin">Σφάλμα κατά την φόρτωση προφίλ! Είναι έγκυρο το όνομα χρήστη; Ή σας μπλοκάρισε;</string>
+    <string name="error_loading_profile">Σφάλμα κατά τη φόρτωση προφίλ! Είναι το όνομα χρήστη έγκυρο; Αν ναι, μπορεί να είστε περιορισμένος.</string>
+    <string name="error_loading_profile_loggedin">Σφάλμα κατά τη φόρτωση λογαριασμού! Είναι το όνομα χρήστη έγκυρο; Μήπως ο χρήστης σας έχει μπλοκάρει;</string>
     <string name="error_loading_hashtag">Σφάλμα κατά τη φόρτωση hashtag! Είναι το όνομα έγκυρο;</string>
-    <string name="error_loading_location">Σφάλμα κατά την φόρτωση τοποθεσίας! Είναι το URL έγκυρο;</string>
-    <string name="error_creating_folders">Σφάλμα κατά τη δημιουργία φακέλου/ων λήψης.</string>
+    <string name="error_loading_location">Σφάλμα κατά την φόρτωση τοποθεσίας! Είναι η διεύθυνση έγκυρη;</string>
+    <string name="error_creating_folders">Σφάλμα κατά τη δημιουργία φακέλου/-ων λήψης.</string>
     <string name="save_to_folder">Αποθήκευση σε προσαρμοσμένο φάκελο</string>
-    <string name="select_folder">Επιλογή Φακέλου</string>
+    <string name="select_folder">Επιλογή φακέλου</string>
     <string name="theme_settings">Θέμα</string>
     <string name="login_settings">Επηρεάζει μόνο τους συνδεδεμένους χρήστες:</string>
-    <string name="anonymous_settings">Επηρεάζει μόνο ανώνυμους χρήστες:</string>
+    <string name="anonymous_settings">Επηρεάζει μόνο τους ανώνυμους χρήστες:</string>
     <string name="select_language">Γλώσσα</string>
     <plurals name="main_posts_count">
         <item quantity="one">%s\nΔημοσίευση</item>
@@ -52,23 +54,25 @@
         <item quantity="one">%s\nΑκόλουθος</item>
         <item quantity="other">%s\nΑκόλουθοι</item>
     </plurals>
-    <string name="main_posts_following">%s\nΑκολουθείται</string>
-    <string name="post_viewer_autoplay_video">Παίζε αυτόματα τα βίντεο</string>
-    <string name="post_viewer_muted_autoplay">Πάντα βάζε τα βίντεο σε σιγή</string>
-    <string name="post_viewer_show_captions">Να εμφανίζονται πάντα οι λεζάντες δημοσιέυσεων</string>
-    <string name="post_viewer_download_dialog_title">Επιλογή τι να κατεβεί</string>
-    <string name="post_viewer_download_current">Συγκεκριμένο</string>
-    <string name="post_viewer_download_album">Ολόκληρο Άλμπουμ</string>
-    <string name="show_stories">Εμφάνιση Ιστοριών</string>
+    <string name="main_posts_following">%s\nΑκολουθείτε</string>
+    <string name="post_viewer_autoplay_video">Αυτόματη αναπαραγωγή των βίντεο</string>
+    <string name="post_viewer_background_play">Συνέχεια βίντεο στο παρασκήνιο</string>
+    <string name="post_viewer_background_play_summary">Να μην γίνεται παύση των βίντεο όταν η εφαρμογή είναι εκτός εστίασης</string>
+    <string name="post_viewer_muted_autoplay">Μόνιμη σίγαση των βίντεο</string>
+    <string name="post_viewer_show_captions">Μόνιμη εμφάνιση των λεζαντών των δημοσιεύσεων</string>
+    <string name="post_viewer_download_dialog_title">Επιλογή δημοσιεύσεων για λήψη</string>
+    <string name="post_viewer_download_current">Τρέχουσα</string>
+    <string name="post_viewer_download_album">Πλήρη συλλογή</string>
+    <string name="show_stories">Εμφάνιση ιστοριών</string>
     <string name="no_more_stories">Δεν υπάρχουν άλλες ιστορίες!</string>
     <string name="be_patient">Κάντε υπομονή!</string>
-    <string name="view_story_post">Προβολη Δημοσίευσης</string>
+    <string name="view_story_post">Προβολή Δημοσίευσης</string>
     <string name="view_post">Προβολή Δημοσίευσης</string>
     <string name="spotify">Spotify</string>
     <string name="vote_story_poll">Ψηφίστε</string>
     <string name="votef_story_poll">Η ψήφος ήταν επιτυχής!</string>
     <string name="voted_story_poll">Έχετε ήδη ψηφίσει!</string>
-    <string name="respond_story">Ανταπόκριση</string>
+    <string name="respond_story">Απάντηση</string>
     <string name="answer_hint">Απάντηση…</string>
     <string name="answered_story">Η απάντηση ήταν επιτυχής!</string>
     <plurals name="slider_info" comment="For slider stickers in stories, eg. 3 responses averaging 17.38%">
@@ -82,16 +86,16 @@
     <string name="story_slider">Slider</string>
     <string name="story_quizzed">Έχετε ήδη απαντήσει!</string>
     <string name="story_mentions">Αναφορές</string>
-    <string name="priv_acc">Αυτός ο Λογαριασμός είναι Ιδιωτικός</string>
-    <string name="priv_acc_confirm">Δεν θα έχετε πρόσβαση σε δημοσιεύσεις μετά από την άρση ακολούθησης! Είστε σίγουροι;</string>
+    <string name="priv_acc">Ιδιωτικός λογαριασμός</string>
+    <string name="priv_acc_confirm">Δε θα έχετε πρόσβαση στις δημοσιεύσεις μετά την άρση ακολούθησης! Είστε βέβαιος;</string>
     <string name="no_acc">Μπορείτε να συνδεθείτε μέσω του Περισσότερα-&gt; Λογαριασμός στην κάτω δεξιά γωνία ή μπορείτε να δείτε δημόσιους λογαριασμούς χωρίς σύνδεση!</string>
-    <string name="empty_acc">Αυτός ο Λογαριασμός δεν έχει Δημοσιεύσεις</string>
+    <string name="empty_acc">Αυτός ο λογαριασμός δεν έχει δημοσιεύσεις</string>
     <string name="empty_list">Δεν Υπάρχουν Τέτοιες Δημοσιεύσεις!</string>
     <string name="login">Σύνδεση</string>
     <string name="logout">Αποσύνδεση</string>
-    <string name="logout_summary">Περιήγηση στο Instagram ανώνυμα</string>
+    <string name="logout_summary">Ανώνυμη περιήγηση στο Instagram</string>
     <string name="remove_all_acc">Αφαίρεση όλων των λογαριασμών</string>
-    <string name="remove_all_acc_warning">Αυτό θα καταργήσει όλους τους λογαριασμούς που έχουν προστεθέι στην εφαρμογή!\nΓια να καταργήσετε μόνο έναν λογαριασμό, πατήστε παρατεταμένα το λογαριασμό από το διάλογο εναλλαγής λογαριασμού.\nΘέλετε να συνεχίσετε;</string>
+    <string name="remove_all_acc_warning">Έτσι, θα αφαιρεθούν όλοι οι λογαριασμοί που έχουν προστεθεί στην εφαρμογή!\nΓια να αφαιρέσετε μόνο έναν λογαριασμό, πατήστε τον παρατεταμένα από τον διάλογο εναλλαγής λογαριασμών.\nΘέλετε να συνεχίσετε;</string>
     <string name="time_settings">Μορφή ημερομηνίας</string>
     <string name="saved_create_collection">Δημιουργία νέας συλλογής</string>
     <string name="edit_collection">Επεξεργασία ονόματος συλλογής</string>
@@ -99,26 +103,26 @@
     <string name="delete_collection_confirm">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή τη συλλογή;</string>
     <string name="delete_collection_note">Όλα τα πολυμέσα που περιέχονται θα παραμείνουν σε άλλες συλλογές.</string>
     <string name="add_to_collection">Προσθήκη στη συλλογή...</string>
-    <string name="remove_from_collection">Κατάργηση από τη συλλογή</string>
-    <string name="liked">Επισημασμένο ως \"Μου αρέσει\"</string>
-    <string name="saved">Αποθηκεύτηκε</string>
-    <string name="tagged">Επισημάνθηκε η ετικέτα</string>
+    <string name="remove_from_collection">Αφαίρεση από τη συλλογή</string>
+    <string name="liked">Μ\'αρέσουν</string>
+    <string name="saved">Αποθηκευμένα</string>
+    <string name="tagged">Ετικέτες</string>
     <string name="dm_person">Μήνυμα</string>
     <string name="like_without_count">Μου αρέσει</string>
-    <string name="unlike_without_count">Δεν μου αρέσει</string>
+    <string name="unlike_without_count">Δε μου αρέσει</string>
     <string name="bookmark">Αποθήκευση σαν σελιδοδείκτης</string>
     <string name="unbookmark">Διαγραφή σελιδοδείκτη</string>
     <string name="follow">Ακολουθήστε</string>
-    <string name="unfollow">Κατάργηση ακολούθησης</string>
-    <string name="favorite_short" comment="Adjective, not verb">Προσθήκη στα αγαπημένα</string>
+    <string name="unfollow">Να μην ακολουθώ</string>
+    <string name="favorite_short" comment="Adjective, not verb">Αγαπημένα</string>
     <string name="block">Αποκλεισμός</string>
     <string name="unblock">Άρση αποκλεισμού</string>
     <string name="restrict">Περιορισμός</string>
     <string name="unrestrict">Άρση Περιορισμού</string>
     <string name="mute_stories">Σίγαση ιστοριών</string>
     <string name="mute_posts">Σίγαση δημοσιεύσεων</string>
-    <string name="unmute_stories">Κατάργηση σίγασης ιστοριών</string>
-    <string name="unmute_posts">Κατάργηση σίγασης δημοσιεύσεων</string>
+    <string name="unmute_stories">Άρση σίγασης ιστοριών</string>
+    <string name="unmute_posts">Άρση σίγασης δημοσιεύσεων</string>
     <string name="bio_copy">Αντιγραφή βιογραφικού</string>
     <string name="bio_translate">Μετάφραση βιογραφικού</string>
     <string name="status_mutual">Κοινά</string>
@@ -129,10 +133,10 @@
     <string name="dialog_export_settings">Ρυθμίσεις</string>
     <string name="dialog_export_favorites">Αγαπημένα</string>
     <string name="dialog_import_success">Η εισαγωγή ήταν επιτυχής!</string>
-    <string name="dialog_import_failed">Η εισαγωγή ήταν ανεπιτυχής!</string>
+    <string name="dialog_import_failed">Η εισαγωγή απέτυχε!</string>
     <string name="dialog_export_success">Η εξαγωγή ήταν επιτυχής!</string>
     <string name="dialog_export_failed">Η εξαγωγή απέτυχε!</string>
-    <string name="refresh">Επαναφόρτωση</string>
+    <string name="refresh">Ανανέωση</string>
     <string name="get_cookies">Λήψη cookies</string>
     <string name="desktop_2fa">Λειτουργία Επιφάνειας Εργασίας</string>
     <string name="time_settings_title_custom">Χρήση προσαρμοσμένης μορφής</string>
@@ -142,7 +146,7 @@
     <string name="time_settings_title_preview">Προεπισκόπηση</string>
     <string name="time_settings_swap_time">Εναλλαγή θέσεων ώρας και ημερομηνίας</string>
     <string name="quick_access_cannot_delete_curr">Αδυναμία διαγραφής λογαριασμού που χρησιμοποιείται αυτή την στιγμή</string>
-    <string name="quick_access_confirm_delete">Είστε βέβαιοι ότι θέλετε να διαγράψετε το \'%s\';</string>
+    <string name="quick_access_confirm_delete">Είστε βέβαιος ότι θέλετε να διαγράψετε το «%s»;</string>
     <string name="open_profile">Άνοιγμα προφίλ</string>
     <string name="view_story">Προβολή ιστορίας</string>
     <string name="view_pfp">Προβολή εικόνας προφίλ</string>
@@ -154,106 +158,106 @@
     <string name="dms_inbox_shared_video">%s κοινοποίησε ένα βίντεο</string>
     <string name="dms_inbox_shared_message">%s έστειλε ένα μήνυμα</string>
     <string name="dms_inbox_shared_gif">%s κοινοποίησε ένα gif</string>
-    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
+    <string name="dms_inbox_shared_sticker">%s κοινοποίησε ένα αυτοκόλλητο</string>
     <string name="dms_inbox_shared_profile">%s κοινοποίησε ένα προφίλ: @%s</string>
-    <string name="dms_inbox_shared_location">%s μοιράστηκε μια τοποθεσία: %s</string>
-    <string name="dms_inbox_shared_highlight">%s κοινοποίησε μια ιστορία highlight από @%s</string>
-    <string name="dms_inbox_shared_story">%s κοινοποίησε μια δημοσίευση από @%s</string>
+    <string name="dms_inbox_shared_location">%s κοινοποίησε μία τοποθεσία: %s</string>
+    <string name="dms_inbox_shared_highlight">%s κοινοποίησε ένα highlight ιστορίας από @%s</string>
+    <string name="dms_inbox_shared_story">%s κοινοποίησε μία ιστορία από @%s</string>
     <string name="dms_inbox_shared_voice">%s έστειλε ένα ηχητικό μήνυμα</string>
     <string name="dms_inbox_shared_clip">%s κοινοποίησε ένα κλιπ από @%s</string>
     <string name="dms_inbox_shared_igtv">%s κοινοποίησε ένα IGTV βίντεο από @%s</string>
-    <string name="dms_inbox_replied_story_outgoing">Απαντήσατε στην ιστορία τους: %s</string>
+    <string name="dms_inbox_replied_story_outgoing">Απαντήσατε στην ιστορία του: %s</string>
     <string name="dms_inbox_replied_story_incoming">%s απάντησε στην ιστορία σας: %s</string>
-    <string name="dms_inbox_reacted_story_outgoing">Αντιδράσατε στην ιστορία τους: %s</string>
+    <string name="dms_inbox_reacted_story_outgoing">Αντιδράσατε στην ιστορία του: %s</string>
     <string name="dms_inbox_reacted_story_incoming">%s αντέδρασε στην ιστορία σας: %s</string>
     <string name="dms_inbox_mentioned_story_outgoing">Αναφέρατε τον χρήστη @%s στην ιστορία σας</string>
     <string name="dms_inbox_mentioned_story_incoming">%s σας ανέφερε στην ιστορία τους</string>
     <string name="dms_inbox_raven_media_unknown"><i>Άγνωστος τύπος πολυμέσου</i></string>
     <string name="dms_inbox_raven_media_expired">Το πολυμέσο έχει λήξει!</string>
     <string name="dms_inbox_raven_media_delivered">Παραδόθηκε</string>
-    <string name="dms_inbox_raven_media_sent">Έχει σταλεί</string>
+    <string name="dms_inbox_raven_media_sent">Απεστάλη</string>
     <string name="dms_inbox_raven_media_opened">Ανοίχτηκε</string>
-    <string name="dms_inbox_raven_media_replayed">Ξαναπαίχτηκε</string>
+    <string name="dms_inbox_raven_media_replayed">Αναπαράχθηκε ξανά</string>
     <string name="dms_inbox_raven_media_sending">Γίνεται Αποστολή…</string>
     <string name="dms_inbox_raven_media_blocked">Αποκλείστηκε</string>
-    <string name="dms_inbox_raven_media_suggested">Προτεινόμενη</string>
-    <string name="dms_inbox_raven_media_screenshot">Τραβήχθηκε στιγμιότυπο οθόνης</string>
+    <string name="dms_inbox_raven_media_suggested">Προτεινόμενα</string>
+    <string name="dms_inbox_raven_media_screenshot">Λήφθηκε στιγμιότυπο οθόνης</string>
     <string name="dms_inbox_raven_media_cant_deliver">Αδυναμία παράδοσης</string>
-    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
+    <string name="dms_inbox_error_null_count">Η απόκριση καταμέτρησης μη προβληθέντων είναι άκυρη!</string>
     <string name="dms_thread_message_hint">Μήνυμα...</string>
     <string name="dms_thread_audio_hint">Πατήστε παρατεταμένα για εγγραφή ήχου</string>
     <string name="dms_thread_updating">Ενημέρωση...</string>
-    <string name="dms_action_leave">Αποχώρηση από την συνομιλία</string>
+    <string name="dms_action_leave">Αποχώρηση από τη συνομιλία</string>
     <string name="dms_action_leave_question">Αποχώρηση από αυτήν τη συνομιλία;</string>
     <string name="dms_action_kick">Διώξιμο</string>
     <string name="dms_left_users">Χρήστες που αποχώρησαν</string>
     <string name="dms_ERROR_INVALID_USER">Μη έγκυρος χρήστης</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Το Instagram δεν επιτρέπει τη αναφόρτωση βίντεο άνω των 60 δευτ. ως μηνύματα.</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Το Instagram δεν επιτρέπει τη αναφόρτωση αρχείων ήχου άνω των 60 δευτ.</string>
     <string name="direct_download">Απευθείας λήψη</string>
-    <string name="direct_download_desc">Λήψεις δημοσιεύσεων απευθείας στο τηλέφωνο!</string>
-    <string name="direct_download_loading">Ανάκτηση δημοσιεύσης/εων</string>
+    <string name="direct_download_desc">Γίνεται λήψη των δημοσιεύσεων απευθείας στο τηλέφωνο!</string>
+    <string name="direct_download_loading">Ανάκτηση δημοσίευσης/-εων</string>
     <string name="downloader_complete">Η λήψη ολοκληρώθηκε</string>
     <string name="downloader_downloading_post">Γίνεται λήψη της δημοσίευσης…</string>
     <string name="downloader_downloading_media">Γίνεται λήψη πολυμέσων</string>
     <string name="downloader_downloading_pfp">Γίνεται λήψη εικόνας προφίλ</string>
     <string name="downloader_unknown_error">Προέκυψε ένα άγνωστο σφάλμα!!!</string>
-    <string name="downloader_error_creating_folder">Σφάλμα κατά την δημιουργία φακέλου!</string>
+    <string name="downloader_error_creating_folder">Σφάλμα κατά τη δημιουργία φακέλου!</string>
     <string name="downloader_error_download_file">Σφάλμα λήψης αρχείου</string>
-    <string name="downloader_too_many">Μπορείτε να κατεβάσετε μόνο 100 δημοσιεύσεις κάθε φορά. Μην είστε τόσο άπληστοι!</string>
+    <string name="downloader_too_many">Μπορείτε να καταφορτώσετε μόνο 100 δημοσιεύσεις τη φορά. Μην είστε τόσο άπληστος!</string>
     <string name="comment_viewer_copy_comment">Αντιγραφή σχολίου</string>
-    <string name="comment_viewer_see_likers">Προβολή αυτών που μάρκαραν το σχόλιο ως \'Μου Αρέσει\'</string>
+    <string name="comment_viewer_see_likers">Προβολή όσων δήλωσαν ότι τους αρέσει το σχόλιο</string>
     <string name="comment_viewer_reply_comment">Απάντηση στο σχόλιο</string>
-    <string name="comment_viewer_like_comment">Επισήμανση σχολίου ως \'Μου Αρέσει\'</string>
-    <string name="comment_viewer_unlike_comment">Αφαίρεση \'Μου Αρέσει\' από το σχόλιο</string>
+    <string name="comment_viewer_like_comment">Επισήμανση ως «Μου Αρέσει»</string>
+    <string name="comment_viewer_unlike_comment">Κατάργηση του «Μου Αρέσει»</string>
     <string name="comment_viewer_translate_comment">Μετάφραση σχολίου</string>
     <string name="comment_viewer_delete_comment">Διαγραφή σχολίου</string>
-    <string name="comment_send_empty_comment">Δεν υπάρχουν κενά σχόλια!</string>
+    <string name="comment_send_empty_comment">Όχι κενά σχόλια!</string>
     <string name="comment_view_mention_user_search">Θέλετε να αναζητήσετε το όνομα χρήστη;</string>
     <string name="comment_view_mention_hash_search">Θέλετε να αναζητήσετε το hashtag;</string>
     <string name="followers_type_followers">Ακόλουθοι</string>
     <string name="followers_type_following">Ακολουθείτε</string>
-    <string name="followers_compare">Σύγκριση ακολούθων &amp; ακολούθείται</string>
-    <string name="followers_both_following">Και οι δύο ακολουθιέστε μεταξύ σας</string>
+    <string name="followers_compare">Σύγκριση ακολούθων</string>
+    <string name="followers_both_following">Ακολουθείτε ο ένας τον άλλον</string>
     <string name="followers_not_following">δεν ακολουθεί %s</string>
     <string name="followers_not_follower">%s δεν ακολουθεί</string>
     <string name="login_error_loading_cookies">Σφάλμα κατά την φόρτωση των cookies</string>
-    <string name="comment_hint">Γράψτε νεο σχόλιο…</string>
+    <string name="comment_hint">Σύνταξη νέου σχολίου…</string>
     <string name="dm_hint">Σύνταξη νέου μηνύματος…</string>
-    <string name="liked_notif">Του άρεσε η δημοσίευση σας</string>
-    <string name="comment_notif">Σχολιάστηκε στην δημοσίευση σας:</string>
+    <string name="liked_notif">Δήλωσε ότι του αρέσει η δημοσίευσή σας</string>
+    <string name="comment_notif">Σχολίασε στη δημοσίευση σας:</string>
     <string name="follow_notif">Ξεκίνησε να σας ακολουθεί</string>
-    <string name="tagged_notif">Πρόσθεσε την ετικέτα σας σε μία δημοσίευση</string>
-    <string name="request_notif">Έκανε αίτημα να σας ακολουθήσει</string>
+    <string name="tagged_notif">Σας πρόσθεσε με ετικέτα σε μια δημοσίευση</string>
+    <string name="request_notif">Ζήτησε να σας ακολουθήσει</string>
     <string name="request_approve">Έγκριση αιτήματος</string>
     <string name="request_reject">Απόρριψη αιτήματος</string>
-    <string name="share_public_post">Μοιραστείτε αυτή τη δημόσια δημοσίευση στο…</string>
-    <string name="share_private_post">Αυτή είναι μια ιδιωτική ανάρτηση! Μοιραστείτε την με αυτούς που μπορούν να την δουν!</string>
-    <string name="discover_empty">Αυτή η κατηγορία είναι κάπως κενή…</string>
+    <string name="share_public_post">Κοινοποιήστε αυτή τη δημόσια δημοσίευση στο…</string>
+    <string name="share_private_post">Αυτή είναι ιδιωτική δημοσίευση! Κοινοποιήστε τη σε εκείνους που μπορούν να τη δουν!</string>
+    <string name="discover_empty">Αυτή η κατηγορία είναι κατά κάποιον τρόπο κενή…</string>
     <string name="update_available">Υπάρχει διαθέσιμη ενημέρωση! (%s)</string>
-    <string name="update_notice">Υπενθύμιση: Εάν το έχετε κατεβάσει από το F-Droid, πρέπει να το ενημερώσετε από αυτό! Το ίδιο ισχύει και για το GitHub.</string>
+    <string name="update_notice">Υπενθύμιση: Εάν η εγκατάσταση έγινε από το F-Droid, από εκεί θα χρειαστεί να γίνουν κι οι ενημερώσεις! Το ίδιο ισχύει και για το GitHub.</string>
     <string name="updated">Ευχαριστούμε που ενημερώσατε το Barinsta!</string>
-    <string name="crash_title">Η εφαρμογή συνετρίβη</string>
-    <string name="crash_descr">Ουπς.. Η εφαρμογή συνετρίβη, αλλά μην ανησυχείτε, μπορείτε να αναφέρετε το σφάλμα στον προγραμματιστή για να τον βοηθήσετε να διορθώσει το πρόβλημα. (:</string>
+    <string name="crash_title">Η εφαρμογή κατέρρευσε</string>
+    <string name="crash_descr">Ώπα.. Η εφαρμογή κατέρρευσε, αλλά μην ανησυχείτε. Μπορείτε να αναφέρετε το σφάλμα στον προγραμματιστή, για να τον βοηθήσετε να διορθώσει το πρόβλημα. (:</string>
     <string name="action_notif">Δραστηριότητα</string>
     <string name="action_archive">Αρχειοθήκη ιστοριών</string>
     <string name="action_ayml">Προτεινόμενοι χρήστες</string>
-    <string name="select_picture">Επιλέξτε Εικόνα</string>
+    <string name="select_picture">Επιλογή εικόνας</string>
     <string name="uploading">Μεταφόρτωση…</string>
     <string name="activity_count_prefix">Έχετε:</string>
     <string name="activity_count_relationship">%d ακόλουθοι</string>
     <string name="activity_count_comments">%d σχόλια</string>
-    <string name="activity_count_commentlikes">%d επισημάνσεις \'Μου Αρέσει\' σε σχόλια</string>
+    <string name="activity_count_commentlikes">Το σχόλιο αρέσει σε %d</string>
     <string name="activity_count_usertags">%d ετικέτες χρήστη</string>
-    <string name="activity_count_likes">%d επισημάνσεις \"Μου αρέσει\"</string>
+    <string name="activity_count_likes">Αρέσει σε %d</string>
     <string name="activity_count_poy">%d φωτογραφίες σας</string>
     <string name="activity_count_requests">%d αιτήματα ακολούθησης</string>
-    <string name="activity_notloggedin">Αποσυνδεθήκατε πριν κάνετε κλικ σε αυτή την ειδοποίηση;!</string>
+    <string name="activity_notloggedin">Αποσυνδεθήκατε προτού πατήσετε αυτήν την ειδοποίηση;!</string>
     <string name="feed">Ροή</string>
     <string name="profile">Προφίλ</string>
-    <string name="more">Περισσότερα</string>
-    <string name="title_dm">ΠΜ</string>
-    <string name="number_selected">%d επιλέχθηκε</string>
+    <string name="more">Λοιπά</string>
+    <string name="title_dm">Μηνύματα</string>
+    <string name="number_selected">Επιλέχθηκαν %d</string>
     <string name="logout_success">Η αποσύνδεση ήταν επιτυχής!</string>
     <string name="dm_thread_info">Πληροφορίες</string>
     <string name="mark_as_seen">Σήμανση ως αναγνωσμένο</string>
@@ -265,37 +269,37 @@
     <string name="pref_category_downloads">Λήψεις</string>
     <string name="pref_category_locale">Τοποθεσία</string>
     <string name="account">Λογαριασμός</string>
-    <string name="account_hint">Η συγκεκριμένη σύνδεση δεν λειτουργεί; Απλά ξαναπροσθέστε τον λογαριασμό.</string>
+    <string name="account_hint">Δε λειτουργεί η τρέχουσα σύνδεση; Απλά προσθέστε ξανά τον λογαριασμό.</string>
     <string name="add_account">Προσθήκη λογαριασμού</string>
     <string name="about_category_license">Άδεια (μόνο στα Αγγλικά)</string>
-    <string name="about_documentation">Επισκεφθείτε την ιστοσελίδα μας</string>
-    <string name="about_documentation_summary">Λάβετε υποστήριξη, συζητήστε, συναντήστε άλλους, και διασκεδάστε!</string>
-    <string name="about_repository">Δείτε τον πηγαίο κώδικα μας στο GitHub</string>
-    <string name="about_repository_summary">Ελέγχου, μαρκάρισμα με αστέρια, αναφορά σφαλμάτων, συνεισφορές, και διασκέδαση (ξανά)!</string>
+    <string name="about_documentation">Επισκεφθείτε τον ιστότοπό μας</string>
+    <string name="about_documentation_summary">Λάβετε υποστήριξη, συζητήστε, συναντήστε άλλους και διασκεδάστε!</string>
+    <string name="about_repository">Δείτε τον πηγαίο κώδικά μας στο GitHub</string>
+    <string name="about_repository_summary">Έλεγχος, αναφορά σφαλμάτων, συνεισφορά και διασκέδαση (ξανά)!</string>
     <string name="about_feedback">Αποστολή σχολίων μέσω ηλ. ταχυδρομείου</string>
     <string name="about_category_3pt">Αποδόσεις Τρίτων</string>
     <string name="reminder">Υπενθύμιση</string>
     <string name="reminder_summary">Παρακαλούμε χρησιμοποιήστε αυτήν την εφαρμογή υπεύθυνα. Οι ληφθείσες εικόνες πρέπει να χρησιμοποιούνται μόνο για σκοπούς που επιτρέπονται από τους ισχύοντες νόμους.</string>
-    <string name="light_white_theme">Άσπρο</string>
+    <string name="light_white_theme">Λευκό</string>
     <string name="dark_black_theme">Μαύρο</string>
-    <string name="light_theme_settings">Φωτείνο θέμα</string>
-    <string name="dark_theme_settings">Σκοτεινό θέμα</string>
-    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
-    <string name="dark_material_dark_theme">Σκοτεινό Material</string>
+    <string name="light_theme_settings">Φωτεινό θέμα</string>
+    <string name="dark_theme_settings">Σκούρο θέμα</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Κόκκοι καφέ</string>
+    <string name="dark_material_dark_theme">Σκουρόχρωμο</string>
     <string name="added_to_favs">Προστέθηκε στα Αγαπημένα!</string>
-    <string name="add_to_favorites">Προσθήκη στα αγαπημένα</string>
+    <string name="add_to_favorites">Στα αγαπημένα</string>
     <string name="accounts">Λογαριασμοί</string>
-    <string name="hashtags">Hashtags</string>
+    <string name="hashtags">Hashtag</string>
     <string name="locations">Τοποθεσίες</string>
     <string name="unknown">Άγνωστο</string>
     <string name="removed_from_favs">Αφαίρεση από τα αγαπημένα!</string>
     <string name="backup_and_restore">Αντίγραφα ασφαλείας &amp; Επαναφορά</string>
-    <string name="backup_summary">Αντίγραφο ασφαλείας ρυθμίσεων εφαρμογής Barinsta, δεδομένα σύνδεσης λογαριασμού και/ή αγαπημένα σε ένα απλό κείμενο ή κρυπτογραφημένο αρχείο αντιγράφου ασφαλείας για μεταγενέστερη επαναφορά.</string>
-    <string name="backup_warning">Αν δημιουργείτε αντίγραφα ασφαλείας των δεδομένων σύνδεσης λογαριασμού, αντιμετωπίζετε το αρχείο ως απόρρητο και κρατήστε το κάπου που είναι ασφαλές!</string>
+    <string name="backup_summary">Δημιουργία αντιγράφου ασφαλείας των ρυθμίσεων της εφαρμογής, των δεδομένων σύνδεσης του λογαριασμού και/ή των αγαπημένων, σε ακρυπτογράφητο ή κρυπτογραφημένο αρχείο για μεταγενέστερη επαναφορά.</string>
+    <string name="backup_warning">Αν δημιουργείτε αντίγραφα ασφαλείας των δεδομένων σύνδεσης λογαριασμού, αντιμετωπίστε το αρχείο ως απόρρητο και κρατήστε το σε ασφαλές μέρος!</string>
     <string name="create_backup">Δημιουργία νέου αρχείου αντιγράφου ασφαλείας</string>
     <string name="restore_backup">Επαναφορά από υπάρχον αρχείο αντιγράφου ασφαλείας</string>
     <string name="file_chosen_label">Αρχείο:</string>
-    <string name="enter_password">Εισαγωγή κωδικού πρόσβασης</string>
+    <string name="enter_password">Καταχώριση κωδικού πρόσβασης</string>
     <string name="select_backup_file">Επιλέξτε ένα αρχείο αντιγράφου ασφαλείας (.zaai/.backup)</string>
     <string name="apply">Εφαρμογή</string>
     <string name="save">Αποθήκευση</string>
@@ -303,16 +307,16 @@
     <string name="edit_caption">Επεξεργασία λεζάντας</string>
     <string name="translate_caption">Μετάφραση λεζάντας</string>
     <string name="player_timeline_desc">Χρονοδιάγραμμα αναπαραγωγού βίντεο</string>
-    <string name="liking">Μαρκάρισμα ως \'Μου Αρέσει\'…</string>
-    <string name="like_unsuccessful">Το μαρκάρισμα ως \'Μου Αρέσει\' ήταν ανεπιτυχές</string>
-    <string name="unlike_unsuccessful">Η κατάργηση \'Μου Αρέσει\' ήταν ανεπιτυχής</string>
-    <string name="unliking">Κατάργηση \'Μου Αρέσει\'…</string>
+    <string name="liking">«Μου αρέσει»…</string>
+    <string name="like_unsuccessful">Ανεπιτυχής επισήμανση ως «Μου Αρέσει»</string>
+    <string name="unlike_unsuccessful">Ανεπιτυχής αναίρεση του «Μου Αρέσει»</string>
+    <string name="unliking">Αναίρεση «Μου Αρέσει»…</string>
     <string name="controls">Στοιχεία ελέγχου</string>
     <string name="saving">Αποθήκευση…</string>
     <string name="removing">Αφαίρεση…</string>
-    <string name="save_unsuccessful">Η αποθήκευση ΔΕΝ ήταν επιτυχής</string>
-    <string name="save_remove_unsuccessful">Η αφαίρεση ΔΕΝ ήταν επιτυχής</string>
-    <string name="downloading">Γίνεται λήψη…</string>
+    <string name="save_unsuccessful">Η αποθήκευση ήταν ανεπιτυχής</string>
+    <string name="save_remove_unsuccessful">Η αφαίρεση ήταν ανεπιτυχής</string>
+    <string name="downloading">Λήψη…</string>
     <string name="downloader_downloading_child">Λήψη στοιχείου %1$d από %2$d</string>
     <string name="delete">Διαγραφή</string>
     <string name="comment">Σχόλιο</string>
@@ -320,20 +324,20 @@
     <string name="feed_stories">Ροή ιστοριών</string>
     <string name="opening_post">Άνοιγμα δημοσίευσης...</string>
     <string name="share">Κοινοποίηση</string>
-    <string name="layout_style">Στυλ διάταξης</string>
+    <string name="layout_style">Τρόπος διάταξης</string>
     <string name="column_count">Πλήθος στηλών</string>
     <string name="two">2</string>
     <string name="three">3</string>
     <string name="show_names">Εμφάνιση ονομάτων</string>
-    <string name="show_avatars">Προβολή άβαταρ</string>
-    <string name="avatar_size">Μέγεθος άβαταρ</string>
+    <string name="show_avatars">Εμφάνιση εικόνας προφίλ</string>
+    <string name="avatar_size">Μέγεθος εικόνας προφίλ</string>
     <string name="corners">Γωνίες</string>
-    <string name="show_grid_gap">Εμφάνιση διάταξης πλέγματος</string>
-    <string name="disable_animation">Απενεργοποίηση των εφέ</string>
+    <string name="show_grid_gap">Εμφάνιση κενού πλέγματος</string>
+    <string name="disable_animation">Απενεργοποίηση κινουμ. σχεδίων</string>
     <string name="follower_wait_to_load">Παρακαλούμε περιμένετε να ολοκληρωθεί πρώτα η τρέχουσα εργασία!</string>
-    <string name="follower_start_compare">Ανάλογα με τις μετρήσεις του χρήστη, αυτό μπορεί να πάρει λίγο χρόνο για να φορτωθεί. Μείνετε υπομονετικοί.</string>
-    <string name="post_not_found">Η δημοσίευση δεν βρέθηκε!</string>
-    <string name="no_external_app_url">Δεν βρέθηκε εφαρμογή που να ανοίγει urls</string>
+    <string name="follower_start_compare">Αναλόγως τις μετρήσεις χρηστών, ενδέχεται να καθυστερήσει η φόρτωση. Κάντε υπομονή.</string>
+    <string name="post_not_found">Δε βρέθηκε η δημοσίευση!</string>
+    <string name="no_external_app_url">Δε βρέθηκε εφαρμογή ανοίγματος url</string>
     <string name="gallery">Συλλογή</string>
     <string name="camera">Κάμερα</string>
     <string name="all_photos">Όλες οι φωτογραφίες</string>
@@ -341,7 +345,7 @@
     <string name="all_videos">Όλα τα βίντεο</string>
     <string name="brightness">Φωτεινότητα</string>
     <string name="contrast">Αντίθεση</string>
-    <string name="vibrance">Δόνηση</string>
+    <string name="vibrance">Ζωντάνια</string>
     <string name="saturation">Κορεσμός</string>
     <string name="sharpen">Όξυνση</string>
     <string name="exposure">Έκθεση</string>
@@ -360,8 +364,8 @@
     <string name="crop">Περικοπή</string>
     <string name="normal">Κανονικό</string>
     <plurals name="likes_count">
-        <item quantity="one">%d επισήμανση \"Μου αρέσει\"</item>
-        <item quantity="other">%d επισημάνσεις \"Μου αρέσει\"</item>
+        <item quantity="one">Αρέσει σε %d</item>
+        <item quantity="other">Αρέσει σε %d</item>
     </plurals>
     <plurals name="comments_count">
         <item quantity="one">%d σχόλιο</item>
@@ -380,20 +384,20 @@
     <string name="title">Τίτλος</string>
     <string name="members">Μέλη</string>
     <string name="admin">Διαχειριστής</string>
-    <string name="inviter">Προσκεκλημμένος</string>
+    <string name="inviter">Προσκαλών</string>
     <string name="mute_messages">Σίγαση μηνυμάτων</string>
     <string name="mute_mentions">Σίγαση αναφορών</string>
     <string name="add_members">Προσθήκη μελών</string>
     <string name="search">Αναζήτηση</string>
     <string name="done">Έγινε</string>
-    <string name="dms_action_make_admin">Ορισμός ως Διαχειριστής</string>
-    <string name="dms_action_remove_admin">Κατάργηση σαν Διαχειριστής</string>
+    <string name="dms_action_make_admin">Θέστε ως διαχειριστή</string>
+    <string name="dms_action_remove_admin">Κατάργηση ως Διαχειριστής</string>
     <string name="edit_unsuccessful">Η επεξεργασία απέτυχε</string>
     <string name="message">Μήνυμα</string>
     <string name="reply">Απάντηση</string>
     <string name="tap_to_remove">Πατήστε για αφαίρεση</string>
     <string name="forward">Προώθηση</string>
-    <string name="forward_outgoing">Έχετε προωθήσει ένα μήνυμα</string>
+    <string name="forward_outgoing">Προωθήσατε ένα μήνυμα</string>
     <string name="forward_incoming">Προωθήθηκε ένα μήνυμα</string>
     <string name="add">Προσθήκη</string>
     <string name="send">Αποστολή</string>
@@ -405,20 +409,20 @@
     <string name="replied_group">Απαντήθηκε στον %s</string>
     <string name="replied_to_you">Σας απάντησε</string>
     <string name="replied_to_themself">Απάντησε στον εαυτό του</string>
-    <string name="reacted_story_outgoing">Αντιδράσατε στην ιστορία τους</string>
+    <string name="reacted_story_outgoing">Αντιδράσατε στην ιστορία του</string>
     <string name="reacted_story_incoming">Αντέδρασε στην ιστορία σας</string>
-    <string name="mentioned_story_outgoing">Τους αναφέρατε στην ιστορία σας</string>
-    <string name="mentioned_story_incoming">Σας ανέφερε στην ιστορία τους</string>
-    <string name="replied_story_outgoing">Απαντήσατε στην ιστορία τους</string>
+    <string name="mentioned_story_outgoing">Τον αναφέρατε στην ιστορία σας</string>
+    <string name="mentioned_story_incoming">Σας ανέφερε στην ιστορία του</string>
+    <string name="replied_story_outgoing">Απαντήσατε στην ιστορία του</string>
     <string name="replied_story_incoming">Απάντησε στην ιστορία σας</string>
-    <string name="raven_image_expired">Η εικόνα έχει λήξει</string>
+    <string name="raven_image_expired">Η εικόνα έληξε</string>
     <string name="raven_image_info">Η εικόνα θα λήξει όταν προβληθεί</string>
     <string name="raven_video_expired">Το βίντεο έληξε</string>
     <string name="raven_video_info">Το βίντεο θα λήξει όταν προβληθεί</string>
-    <string name="raven_msg_expired">Το μήνυμα έχει λήξει</string>
+    <string name="raven_msg_expired">Το μήνυμα έληξε</string>
     <string name="raven_msg_info">Το μήνυμα θα λήξει όταν προβληθεί</string>
     <string name="story_share">Ιστορία του @%s</string>
-    <string name="story_share_highlight">Ιστορία highlight του @%s</string>
+    <string name="story_share_highlight">Highlight ιστορίας του @%s</string>
     <string name="photo">Φωτογραφία</string>
     <string name="video">Βίντεο</string>
     <string name="voice_message">Ηχητικό μήνυμα</string>
@@ -437,26 +441,47 @@
     <string name="decline">Απόρριψη</string>
     <string name="accept">Αποδοχή</string>
     <string name="you">Εσείς</string>
-    <string name="no_pending_requests">No pending requests</string>
-    <string name="checking_for_new_messages">Γίνεται έλεγχος για νέες μηνύματα</string>
+    <string name="no_pending_requests">Δεν υπάρχουν εκκρεμή αιτήματα</string>
+    <string name="checking_for_new_messages">Γίνεται έλεγχος για νέα μηνύματα</string>
     <string name="pref_category_stories">Ιστορίες</string>
-    <string name="pref_category_dm">DM</string>
+    <string name="pref_category_dm">Μηνύματα</string>
     <string name="pref_category_notifications">Ειδοποιήσεις</string>
     <string name="pref_category_post">Δημοσίευση</string>
-    <string name="enable_dm_notifications">Enable DM notifications</string>
-    <string name="enable_dm_auto_refesh">Auto refresh messages</string>
+    <string name="enable_dm_notifications">Ενεργοποίηση ειδοποιήσεων μηνυμάτων</string>
+    <string name="enable_dm_auto_refesh">Αυτόματη ανανέωση μηνυμάτων</string>
     <string name="auto_refresh_every">Αυτόματη ανανέωση κάθε</string>
     <string name="secs">δεύτερα</string>
     <string name="mins">λεπτά</string>
-    <string name="search_giphy">Αναζήτηση Στο GIPHY</string>
-    <string name="generic_null_response">Response is null!</string>
-    <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
+    <string name="search_giphy">Αναζήτηση στο GIPHY</string>
+    <string name="generic_null_response">Άκυρη απόκριση!</string>
+    <string name="generic_not_ok_response">Η κατάσταση απόκρισης δεν είναι εντάξει!</string>
+    <string name="generic_failed_request">Αποτυχία αιτήματος!</string>
     <string name="hint_keyword">Λέξη-κλειδί</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Σήμανθηκε ως αναγνωσμένο</string>
+    <string name="toggle_keyword_filter">Ενεργοποίηση φίλτρου λέξεων-κλειδιών</string>
+    <string name="edit_keyword_filter">Επεξεργασία φίλτρων λέξεων-κλειδιών</string>
+    <string name="added_keywords">Προστέθηκε λέξη-κλειδί: %s στον κατάλογο φιλτραρίσματος</string>
+    <string name="removed_keywords">Αφαιρέθηκε λέξη-κλειδί: %s στον κατάλογο φιλτραρίσματος</string>
+    <string name="marked_as_seen">Επισήμανθηκε ως αναγνωσμένο</string>
     <string name="delete_unsuccessful">Η διαγραφή απέτυχε</string>
+    <string name="throttle_error">Περιορίστηκατε από το Instagram λόγω υπερβολικών αιτήσεων API. Περιμένετε ορισμένη ώρα προτού προσπαθήσετε ξανά.</string>
+    <string name="error">Σφάλμα</string>
+    <string name="account_logged_out">Αυτός ο λογαριασμός έχει αποσυνδεθεί.</string>
+    <string name="login_required">Απαιτείται σύνδεση!</string>
+    <string name="sentry_block">Φραγή Sentry.</string>
+    <string name="inactive_user">Ο χρήστης είναι ανενεργός!</string>
+    <string name="crash_report_subject">Αναφορά Κατάρρευσης Barinsta</string>
+    <string name="crash_report_title">Επιλέξτε μια εφαρμογή ηλ. ταχυδρομείου για αποστολή αρχείων καταγραφής κατάρρευσης</string>
+    <string name="not_found">Δε βρέθηκε!</string>
+    <string name="rate_limit">Η διεύθυνση IP σας έχει περιοριστεί από το Instagram. Περιμένετε για μία ώρα και μετά προσπαθήστε ξανά.</string>
+    <string name="skip_update">Παράλειψη της ενημέρωσης</string>
+    <string name="on_latest_version">Η εφαρμογή είναι ήδη στην τελευταία έκδοση</string>
+    <string name="tab_order">Σειρά της οθόνης</string>
+    <string name="other_tabs">Λοιπές καρτέλες</string>
+    <string name="tab_order_start_next_launch">Η σειρά των καρτελών θα ισχύσει από την επόμενη εκκίνηση</string>
+    <string name="dm_remove_warning">Εάν αποθηκευτεί, όλες οι λειτουργίες που είναι σχετικές με τα Μηνύματα, θα είναι απενεργοποιημένες στην επόμενη εκκίνηση</string>
+    <string name="copy_caption">Αντιγραφή λεζάντας</string>
+    <string name="copy_reply">Αντιγραφή απάντησης</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
index 3c89597f..4d5bed14 100755
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>segs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f392ec86..89e604e2 100755
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Buscar actualizaciones al inicio</string>
     <string name="flag_secure">Bloquea capturas de pantalla &amp; vista previa de aplicaciones</string>
     <string name="download_user_folder">Usar subcarpetas con el nombre de usuario</string>
+    <string name="download_prepend_username">Añadir nombre de usuario al inicio del nombre del archivo</string>
     <string name="mark_as_seen_setting">Marcar historias como vistas después de verlas</string>
     <string name="mark_as_seen_setting_summary">El autor de la historia sabrá que lo has visto</string>
+    <string name="hide_muted_reels_setting">Ocultar historias silenciadas del feed</string>
     <string name="dm_mark_as_seen_setting">Marcar Mensaje Directo como visto después de verlo</string>
     <string name="dm_mark_as_seen_setting_summary">Otros miembros sabrán que lo has visto</string>
     <string name="activity_setting">Activar notificaciones de actividad</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nSiguiendo</string>
     <string name="post_viewer_autoplay_video">Autorreproducir vídeos</string>
+    <string name="post_viewer_background_play">Continuar vídeos en segundo plano</string>
+    <string name="post_viewer_background_play_summary">No pausar vídeos cuando la aplicación está fuera de enfoque</string>
     <string name="post_viewer_muted_autoplay">Siempre silenciar vídeos</string>
     <string name="post_viewer_show_captions">Mostrar siempre subtítulos del post</string>
     <string name="post_viewer_download_dialog_title">Seleccionar qué descargar</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Se eliminó la palabra clave: %s de la lista de filtros</string>
     <string name="marked_as_seen">Marcado como visto</string>
     <string name="delete_unsuccessful">Eliminación fallida</string>
+    <string name="throttle_error">Restringido por Instagram por hacer demasiadas solicitudes de API. Espera un tiempo antes de reintentar.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">Esta cuenta ha sido desconectada.</string>
+    <string name="login_required">¡Inicio de sesión requerido!</string>
+    <string name="sentry_block">Bloqueo de Sentry.</string>
+    <string name="inactive_user">¡Usuario inactivo!</string>
+    <string name="crash_report_subject">Informe de fallos de Barinsta</string>
+    <string name="crash_report_title">Seleccione una aplicación de correo electrónico para enviar registros de errores</string>
+    <string name="not_found">¡No encontrado!</string>
+    <string name="rate_limit">Tu IP ha sido limitada por Instagram. Espera una hora e inténtalo de nuevo.</string>
+    <string name="skip_update">Omitir esta actualización</string>
+    <string name="on_latest_version">Ya tienes la última versión</string>
+    <string name="tab_order">Orden de pantalla</string>
+    <string name="other_tabs">Otras pestañas</string>
+    <string name="tab_order_start_next_launch">El orden de la pestaña se reflejará en el próximo lanzamiento</string>
+    <string name="dm_remove_warning">Si se guarda, todas las funcionalidades relacionadas con MDs se desactivarán en el próximo lanzamiento</string>
+    <string name="copy_caption">Copiar título</string>
+    <string name="copy_reply">Copiar respuesta</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-eu/arrays.xml b/app/src/main/res/values-eu/arrays.xml
index 70f105f7..9e98429a 100644
--- a/app/src/main/res/values-eu/arrays.xml
+++ b/app/src/main/res/values-eu/arrays.xml
@@ -44,8 +44,17 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
-        <item>secs</item>
-        <item>mins</item>
+        <item>s</item>
+        <item>m</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dd0321e2..ca7935ec 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Bilatu eguneratzeak abioan</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Deskargatu bidalketak erabiltzaile-izena duten karpetetara</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Markatu istorioak ikusita gisa ikusi ondoren</string>
     <string name="mark_as_seen_setting_summary">Istorioaren egileak ikusi duzula jakingo du</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Markatu MZ ikusita gisa ikusi ondoren</string>
     <string name="dm_mark_as_seen_setting_summary">Beste kideek ikusi duzula jakingo dute</string>
     <string name="activity_setting">Gaitu jarduera-jakinarazpenak</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nJarraituak</string>
     <string name="post_viewer_autoplay_video">Erreproduzitu bideoak automatikoki</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Mututu bideoak beti</string>
     <string name="post_viewer_show_captions">Erakutsi argazki-oina beti</string>
     <string name="post_viewer_download_dialog_title">Hautatu zer deskargatu</string>
@@ -148,7 +152,7 @@
     <string name="view_pfp">Ikusi profil-irudia</string>
     <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
     <string name="dms_inbox_unsend">Ezabatu mezua</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
+    <string name="dms_inbox_giphy">Ikusi GIPHYn</string>
     <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
     <string name="dms_inbox_shared_image">%s shared an image</string>
     <string name="dms_inbox_shared_video">%s shared a video</string>
@@ -182,7 +186,7 @@
     <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
     <string name="dms_thread_message_hint">Mezua...</string>
     <string name="dms_thread_audio_hint">Press and hold to record audio</string>
-    <string name="dms_thread_updating">Updating...</string>
+    <string name="dms_thread_updating">Eguneratzen...</string>
     <string name="dms_action_leave">Utzi txata</string>
     <string name="dms_action_leave_question">Utzi txat hau?</string>
     <string name="dms_action_kick">Bota</string>
@@ -383,20 +387,20 @@
     <string name="inviter">Inviter</string>
     <string name="mute_messages">Mute messages</string>
     <string name="mute_mentions">Mute mentions</string>
-    <string name="add_members">Add members</string>
-    <string name="search">Search</string>
-    <string name="done">Done</string>
-    <string name="dms_action_make_admin">Make Admin</string>
+    <string name="add_members">Gehitu kideak</string>
+    <string name="search">Bilatu</string>
+    <string name="done">Eginda</string>
+    <string name="dms_action_make_admin">Ezarri Admin</string>
     <string name="dms_action_remove_admin">Remove as Admin</string>
     <string name="edit_unsuccessful">Edit was unsuccessful</string>
-    <string name="message">Message</string>
+    <string name="message">Mezua</string>
     <string name="reply">Reply</string>
     <string name="tap_to_remove">Tap to remove</string>
-    <string name="forward">Forward</string>
+    <string name="forward">Birbidali</string>
     <string name="forward_outgoing">You forwarded a message</string>
     <string name="forward_incoming">Forwarded a message</string>
-    <string name="add">Add</string>
-    <string name="send">Send</string>
+    <string name="add">Gehitu</string>
+    <string name="send">Bidali</string>
     <string name="replying_to_yourself">Replying to yourself</string>
     <string name="replying_to_user">Replying to %s</string>
     <string name="replied_to_yourself">You replied to yourself</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-fa/arrays.xml b/app/src/main/res/values-fa/arrays.xml
index 053ad43e..b52e999e 100644
--- a/app/src/main/res/values-fa/arrays.xml
+++ b/app/src/main/res/values-fa/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c6da89cf..43c21b1e 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">بررسی بروزرسانی هنگام آغاز برنامه</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">بارگیری پست ها در پوشه های به نام کاربر</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">نشان کرد استوری ها به عنوان دیده شده بعد از دیدن</string>
     <string name="mark_as_seen_setting_summary">نویسنده استوری می داند که شما آن را دیده اید</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">نشان کردن پیام خصوصی بعنوان دیده شده بعد از دیدن</string>
     <string name="dm_mark_as_seen_setting_summary">کاربران دیگر خواهند فهمید شما این را دیده اید</string>
     <string name="activity_setting">روشن کردن آگهداد فعالیت ها</string>
@@ -45,8 +47,8 @@
         <item quantity="other">%s\nPosts</item>
     </plurals>
     <plurals name="main_posts_count_inline">
-        <item quantity="one">%s Post</item>
-        <item quantity="other">%s Posts</item>
+        <item quantity="one">%s فرسته</item>
+        <item quantity="other">%s فرسته</item>
     </plurals>
     <plurals name="main_posts_followers">
         <item quantity="one">%s\nFollower</item>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nدنبال کننده ها</string>
     <string name="post_viewer_autoplay_video">پخش خودکار فیلم ها</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">همیشه فیلم هارو بی صدا کن</string>
     <string name="post_viewer_show_captions">Always show post captions</string>
     <string name="post_viewer_download_dialog_title">انتخاب کن چی دانلود کنی</string>
@@ -75,7 +79,7 @@
         <item quantity="one">%d response averaging %s</item>
         <item quantity="other">%d responses averaging %s</item>
     </plurals>
-    <string name="slider_answer">Your answer: %s</string>
+    <string name="slider_answer">پاسخ شما: %s</string>
     <string name="reply_story">پاسخ به استوری</string>
     <string name="reply_hint">پاسخ…</string>
     <string name="story_quiz">نظرسنجی</string>
@@ -181,7 +185,7 @@
     <string name="dms_inbox_raven_media_screenshot">اسکرین شات گرفته شده</string>
     <string name="dms_inbox_raven_media_cant_deliver">نمیتواند ارسال شود</string>
     <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
-    <string name="dms_thread_message_hint">Message...</string>
+    <string name="dms_thread_message_hint">پیام...</string>
     <string name="dms_thread_audio_hint">Press and hold to record audio</string>
     <string name="dms_thread_updating">Updating...</string>
     <string name="dms_action_leave">Leave chat</string>
@@ -207,7 +211,7 @@
     <string name="comment_viewer_reply_comment">پاسخ به دیدگاه</string>
     <string name="comment_viewer_like_comment">پسندیدن دیدگاه</string>
     <string name="comment_viewer_unlike_comment">نپسندیدن دیدگاه</string>
-    <string name="comment_viewer_translate_comment">Translate comment</string>
+    <string name="comment_viewer_translate_comment">گرداندن دیدگاه</string>
     <string name="comment_viewer_delete_comment">هذف دیدگاه</string>
     <string name="comment_send_empty_comment">بدون دیدگاه تهی!</string>
     <string name="comment_view_mention_user_search">ایا میخواهید نام کاربری جستوجو کنید ؟</string>
@@ -337,8 +341,8 @@
     <string name="no_external_app_url">No app found which opens urls</string>
     <string name="gallery">Gallery</string>
     <string name="camera">فرتورانداز</string>
-    <string name="all_photos">All Photos</string>
-    <string name="all_media">All Media</string>
+    <string name="all_photos">همۀ فرتورها</string>
+    <string name="all_media">همۀ رسانه‌ها</string>
     <string name="all_videos">All Videos</string>
     <string name="brightness">Brightness</string>
     <string name="contrast">Contrast</string>
@@ -355,7 +359,7 @@
     <string name="box_blur">Box blur</string>
     <string name="sepia">Sepia</string>
     <string name="clarendon">Clarendon</string>
-    <string name="one977">1977</string>
+    <string name="one977">۱۹۹۷</string>
     <string name="aden">Aden</string>
     <string name="reset">Reset</string>
     <string name="crop">Crop</string>
@@ -390,7 +394,7 @@
     <string name="dms_action_make_admin">Make Admin</string>
     <string name="dms_action_remove_admin">Remove as Admin</string>
     <string name="edit_unsuccessful">Edit was unsuccessful</string>
-    <string name="message">Message</string>
+    <string name="message">پیام</string>
     <string name="reply">Reply</string>
     <string name="tap_to_remove">Tap to remove</string>
     <string name="forward">Forward</string>
@@ -420,7 +424,7 @@
     <string name="raven_msg_info">Message will expire when seen</string>
     <string name="story_share">\@%s\'s story</string>
     <string name="story_share_highlight">\@%s\'s story highlight</string>
-    <string name="photo">Photo</string>
+    <string name="photo">فرتور</string>
     <string name="video">Video</string>
     <string name="voice_message">Voice message</string>
     <string name="post">فرسته</string>
@@ -441,9 +445,9 @@
     <string name="no_pending_requests">No pending requests</string>
     <string name="checking_for_new_messages">Checking for new messages</string>
     <string name="pref_category_stories">Stories</string>
-    <string name="pref_category_dm">DM</string>
-    <string name="pref_category_notifications">Notifications</string>
-    <string name="pref_category_post">Post</string>
+    <string name="pref_category_dm">پیام سرراست</string>
+    <string name="pref_category_notifications">آگهداد</string>
+    <string name="pref_category_post">فرسته</string>
     <string name="enable_dm_notifications">Enable DM notifications</string>
     <string name="enable_dm_auto_refesh">Auto refresh messages</string>
     <string name="auto_refresh_every">Auto refresh every</string>
@@ -460,4 +464,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
index 30e34e69..b2c5109e 100755
--- a/app/src/main/res/values-fr/arrays.xml
+++ b/app/src/main/res/values-fr/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secondes</item>
         <item>minutes</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 15f8a5cc..419d965e 100755
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Rechercher les mises à jours au démarrage</string>
     <string name="flag_secure">Bloquer les captures d\'écran &amp; l\'aperçu de l\'application</string>
     <string name="download_user_folder">Télécharger les messages dans les dossiers des noms d\'utilisateurs</string>
+    <string name="download_prepend_username">Préfixer le nom d\'utilisateur au nom de fichier</string>
     <string name="mark_as_seen_setting">Marquer les stories comme vues après consultation</string>
     <string name="mark_as_seen_setting_summary">L\'auteur de la story saura que vous l\'avez vue</string>
+    <string name="hide_muted_reels_setting">Masquer les stories en sourdine du flux</string>
     <string name="dm_mark_as_seen_setting">Marquer les messages privés comme vus après consultation</string>
     <string name="dm_mark_as_seen_setting_summary">Les autres utilisateurs saurons que vous l\'avez vu</string>
     <string name="activity_setting">Activer les notifications d\'activités</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nAbonnements</string>
     <string name="post_viewer_autoplay_video">Lecture automatique des vidéos</string>
+    <string name="post_viewer_background_play">Continuer les vidéos en arrière-plan</string>
+    <string name="post_viewer_background_play_summary">Ne pas mettre les vidéos en pause lorsque l\'application est inactive</string>
     <string name="post_viewer_muted_autoplay">Toujours couper le son des vidéos</string>
     <string name="post_viewer_show_captions">Toujours afficher les sous-titres de publication</string>
     <string name="post_viewer_download_dialog_title">Sélectionnez ce que vous souhaitez télécharger</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Mot-clé supprimé : %s de la liste de filtres</string>
     <string name="marked_as_seen">Marqué comme vu</string>
     <string name="delete_unsuccessful">Suppression non réussie</string>
+    <string name="throttle_error">Limité par Instagram en raison d\'un trop grand nombre de requêtes API. Attendez un certain temps avant de réessayer.</string>
+    <string name="error">Erreur</string>
+    <string name="account_logged_out">Ce compte a été déconnecté.</string>
+    <string name="login_required">Connexion requise!</string>
+    <string name="sentry_block">Bloc du Guetteur.</string>
+    <string name="inactive_user">L\'utilisateur est inactif!</string>
+    <string name="crash_report_subject">Rapport d\'erreur de Barinsta</string>
+    <string name="crash_report_title">Sélectionnez une application de messagerie pour envoyer les journaux d\'erreurs</string>
+    <string name="not_found">Aucun résultat!</string>
+    <string name="rate_limit">Votre adresse IP a été limitée par Instagram. Attendez une heure et essayez à nouveau.</string>
+    <string name="skip_update">Ignorer cette mise à jour</string>
+    <string name="on_latest_version">Vous avez déjà la dernière version</string>
+    <string name="tab_order">Ordre d\'écran</string>
+    <string name="other_tabs">Autres onglets</string>
+    <string name="tab_order_start_next_launch">L\'ordre des onglets sera reflété au prochain lancement</string>
+    <string name="dm_remove_warning">Si enregistré, toutes les fonctionnalités liées aux DM seront désactivées au prochain lancement</string>
+    <string name="copy_caption">Copie de la légende</string>
+    <string name="copy_reply">Copie de la réponse</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-hi/arrays.xml b/app/src/main/res/values-hi/arrays.xml
index 9b8f6139..cf9cde1c 100644
--- a/app/src/main/res/values-hi/arrays.xml
+++ b/app/src/main/res/values-hi/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index bc923135..1b4546c0 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">खुलने पर अपडेट के लिए जाँच करें</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">पोस्ट को ब्यबहारकारी के नाम पर किये फोल्डरस में रखें</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">स्टोरि को दिखने के बाद \"दिखा गया\" दिखादें</string>
     <string name="mark_as_seen_setting_summary">सटोरि के लेखक जानेगा कि तुम देखे हो इसको</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">तुम देखने के बाद सीधा संदेश को \"दिखागया\" लिखा जाएगा</string>
     <string name="dm_mark_as_seen_setting_summary">अलग सदस्य जानेंगे कि तुम देखे हो</string>
     <string name="activity_setting">क्रियाकलाप सूचनाएँ दिखायें</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nFollowing</string>
     <string name="post_viewer_autoplay_video">वीडियो ऑटोप्ले करें</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">सर्बदा वीडियो को शब्दहिन रखें</string>
     <string name="post_viewer_show_captions">Always show post captions</string>
     <string name="post_viewer_download_dialog_title">डाउनलोड करने के लिए चयन करें</string>
@@ -460,4 +464,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-in/arrays.xml b/app/src/main/res/values-in/arrays.xml
index a691d248..1ce3efc0 100644
--- a/app/src/main/res/values-in/arrays.xml
+++ b/app/src/main/res/values-in/arrays.xml
@@ -44,6 +44,15 @@
         <item>tanggal</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 462c1a2e..8ebaa05e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Cek pembaruan saat memulai</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Unduh kiriman ke folder nama pengguna</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Tandai cerita dibaca setelah melihat</string>
     <string name="mark_as_seen_setting_summary">Pembuat cerita akan tahu Anda melihatnya</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Tandai DM dibaca setelah melihat</string>
     <string name="dm_mark_as_seen_setting_summary">Peserta lain akan tahu Anda melihatnya</string>
     <string name="activity_setting">Nyalakan pemberitahuan aktivitas</string>
@@ -51,6 +53,8 @@
     </plurals>
     <string name="main_posts_following">%s\ndiikuti</string>
     <string name="post_viewer_autoplay_video">Otomatis putar video</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Selalu bisukan video</string>
     <string name="post_viewer_show_captions">Selalu tampilkan keterangan kiriman</string>
     <string name="post_viewer_download_dialog_title">Pilih apa yang akan diunduh</string>
@@ -451,4 +455,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml
index 6bc18600..b95a3a1a 100755
--- a/app/src/main/res/values-it/arrays.xml
+++ b/app/src/main/res/values-it/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secondi</item>
         <item>minuti</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d8202389..c4249bea 100755
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -20,11 +20,13 @@
     <string name="title_discover">Scopri</string>
     <string name="title_comments">Commenti</string>
     <string name="title_notifications">Attività</string>
-    <string name="update_check">Verifica per aggiornamenti all\'avvio</string>
+    <string name="update_check">Verifica aggiornamenti all\'avvio</string>
     <string name="flag_secure">Blocca screenshot &amp; anteprima app</string>
     <string name="download_user_folder">Scarica i post nelle cartelle del nome utente</string>
+    <string name="download_prepend_username">Anteponi Nome Utente al Nome del File</string>
     <string name="mark_as_seen_setting">Segna le storie come viste dopo la visualizzazione</string>
     <string name="mark_as_seen_setting_summary">L\'autore della storia saprà che l\'hai visualizzata</string>
+    <string name="hide_muted_reels_setting">Nascondi storie silenziate dal feed</string>
     <string name="dm_mark_as_seen_setting">Segna il DM come visto dopo la visualizzazione</string>
     <string name="dm_mark_as_seen_setting_summary">Altri membri sapranno che lo hai visualizzato</string>
     <string name="activity_setting">Abilita notifiche attività</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nSeguiti</string>
     <string name="post_viewer_autoplay_video">Riproduzione automatica video</string>
+    <string name="post_viewer_background_play">Continua i video in sottofondo</string>
+    <string name="post_viewer_background_play_summary">Non mettere in pausa i video quando l\'applicazione è inattiva</string>
     <string name="post_viewer_muted_autoplay">Silenzia sempre i video</string>
     <string name="post_viewer_show_captions">Mostra sempre le didascalie dei post</string>
     <string name="post_viewer_download_dialog_title">Seleziona cosa scaricare</string>
@@ -70,7 +74,7 @@
     <string name="voted_story_poll">Hai già votato!</string>
     <string name="respond_story">Rispondi</string>
     <string name="answer_hint">Rispondi…</string>
-    <string name="answered_story">Risposta corretta!</string>
+    <string name="answered_story">Risposta riuscita!</string>
     <plurals name="slider_info" comment="For slider stickers in stories, eg. 3 responses averaging 17.38%">
         <item quantity="one">%d risposta media %s</item>
         <item quantity="other">%d risposte medie %s</item>
@@ -89,7 +93,7 @@
     <string name="empty_list">Nessun Post Simile!</string>
     <string name="login">Accedi</string>
     <string name="logout">Disconettiti</string>
-    <string name="logout_summary">Naviga in Instagram anonimamente</string>
+    <string name="logout_summary">Naviga su Instagram anonimamente</string>
     <string name="remove_all_acc">Rimuovi tutti i profili</string>
     <string name="remove_all_acc_warning">Questo rimuoverà tutti i profili aggiunti dall\'app!\nPer rimuovere solo un profilo, tieni premuto il profilo dalla finestra di cambio del profilo.\nDesideri continuare?</string>
     <string name="time_settings">Formato della Data</string>
@@ -154,7 +158,7 @@
     <string name="dms_inbox_shared_video">%s ha condiviso un video</string>
     <string name="dms_inbox_shared_message">%s ha inviato un messaggio</string>
     <string name="dms_inbox_shared_gif">%s ha condiviso una gif</string>
-    <string name="dms_inbox_shared_sticker">%s ha condiviso uno sticker</string>
+    <string name="dms_inbox_shared_sticker">%s hai condiviso uno sticker</string>
     <string name="dms_inbox_shared_profile">%s ha condiviso un profilo: @%s</string>
     <string name="dms_inbox_shared_location">%s ha condiviso una posizione: %s</string>
     <string name="dms_inbox_shared_highlight">%s ha condiviso una storia evidenziata di @%s</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Parola chiave rimossa: %s dalla lista filtri</string>
     <string name="marked_as_seen">Segnato come visto</string>
     <string name="delete_unsuccessful">Eliminazione non riuscita</string>
+    <string name="throttle_error">Limitato da Instagram a causa delle troppe richieste API. Aspetta un po\' prima di riprovare.</string>
+    <string name="error">Errore</string>
+    <string name="account_logged_out">Questo account è stato disconnesso.</string>
+    <string name="login_required">Login richiesto!</string>
+    <string name="sentry_block">Blocco sentinella.</string>
+    <string name="inactive_user">Utente è inattivo!</string>
+    <string name="crash_report_subject">Rapporto sugli errori di Barinsta</string>
+    <string name="crash_report_title">Selezionare un\'applicazione di posta elettronica per inviare i registri di errori</string>
+    <string name="not_found">Non trovato!</string>
+    <string name="rate_limit">Il tuo IP è stato limitato da Instagram. Aspetta un\'ora e riprova.</string>
+    <string name="skip_update">Salta questo aggiornamento</string>
+    <string name="on_latest_version">Hai già l\'ultima versione</string>
+    <string name="tab_order">Ordine schermata</string>
+    <string name="other_tabs">Altre schede</string>
+    <string name="tab_order_start_next_launch">L\'ordine delle schede sarà rifletto al prossimo avvio</string>
+    <string name="dm_remove_warning">Se salvate, tutte le funzionalità correlate a DM saranno disabilitate al prossimo avvio</string>
+    <string name="copy_caption">Copia didascalia</string>
+    <string name="copy_reply">Copia risposta</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
index 468a763a..f47c31b0 100644
--- a/app/src/main/res/values-ja/arrays.xml
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>秒</item>
         <item>分</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5a11dc06..27a59ddb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -21,10 +21,12 @@
     <string name="title_comments">コメント</string>
     <string name="title_notifications">アクティビティ</string>
     <string name="update_check">起動時にアップデートを確認</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">スクリーンショットとアプリプレビューをブロック</string>
     <string name="download_user_folder">ユーザ名のフォルダに投稿をダウンロード</string>
+    <string name="download_prepend_username">ファイル名の先頭にユーザー名を追加</string>
     <string name="mark_as_seen_setting">ストーリーズを表示後に既読にする</string>
     <string name="mark_as_seen_setting_summary">ストーリーの作成者は、あなたが閲覧したことを知ることができます。</string>
+    <string name="hide_muted_reels_setting">ミュートされたストーリーをフィードから隠す</string>
     <string name="dm_mark_as_seen_setting">DMを表示後に既読にする</string>
     <string name="dm_mark_as_seen_setting_summary">ほかのメンバーは、あなたが閲覧したことを知ることができます。</string>
     <string name="activity_setting">アクティビティの通知を有効化</string>
@@ -51,6 +53,8 @@
     </plurals>
     <string name="main_posts_following">%s\nフォロー中</string>
     <string name="post_viewer_autoplay_video">動画を自動再生する</string>
+    <string name="post_viewer_background_play">バックグラウンドでビデオの再生を続ける</string>
+    <string name="post_viewer_background_play_summary">アプリがフォーカスされていないときにビデオを一時停止しない</string>
     <string name="post_viewer_muted_autoplay">動画を常にミュートする</string>
     <string name="post_viewer_show_captions">キャプションを常に表示</string>
     <string name="post_viewer_download_dialog_title">ダウンロード対象を選択</string>
@@ -93,7 +97,7 @@
     <string name="edit_collection">コレクションの名前を編集</string>
     <string name="delete_collection">コレクションを削除する</string>
     <string name="delete_collection_confirm">このコレクションを削除してもよろしいですか？</string>
-    <string name="delete_collection_note">All contained media will remain in other collections.</string>
+    <string name="delete_collection_note">含まれるすべてのメディアは他のコレクションに残ります。</string>
     <string name="add_to_collection">コレクションに追加する</string>
     <string name="remove_from_collection">コレクションから削除する</string>
     <string name="liked">いいね！</string>
@@ -142,28 +146,28 @@
     <string name="open_profile">プロフィールを開く</string>
     <string name="view_story">ストーリーズを表示</string>
     <string name="view_pfp">プロフィール画像を表示</string>
-    <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
+    <string name="dms_inbox_raven_message_unknown">サポートされていないメッセージ形式です</string>
     <string name="dms_inbox_unsend">メッセージの送信を取り消す</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
-    <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
-    <string name="dms_inbox_shared_image">%s shared an image</string>
-    <string name="dms_inbox_shared_video">%s shared a video</string>
-    <string name="dms_inbox_shared_message">%s sent a message</string>
-    <string name="dms_inbox_shared_gif">%s shared a gif</string>
-    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
-    <string name="dms_inbox_shared_profile">%s shared a profile: @%s</string>
-    <string name="dms_inbox_shared_location">%s shared a location: %s</string>
-    <string name="dms_inbox_shared_highlight">%s shared a story highlight by @%s</string>
-    <string name="dms_inbox_shared_story">%s shared a story by @%s</string>
-    <string name="dms_inbox_shared_voice">%s sent a voice message</string>
-    <string name="dms_inbox_shared_clip">%s shared a clip by @%s</string>
-    <string name="dms_inbox_shared_igtv">%s shared an IGTV video by @%s</string>
-    <string name="dms_inbox_replied_story_outgoing">You replied to their story: %s</string>
-    <string name="dms_inbox_replied_story_incoming">%s replied to your story: %s</string>
-    <string name="dms_inbox_reacted_story_outgoing">You reacted to their story: %s</string>
-    <string name="dms_inbox_reacted_story_incoming">%s reacted to your story: %s</string>
-    <string name="dms_inbox_mentioned_story_outgoing">You mentioned @%s in your story</string>
-    <string name="dms_inbox_mentioned_story_incoming">%s mentioned you in their story</string>
+    <string name="dms_inbox_giphy">GIPHYで見る</string>
+    <string name="dms_inbox_shared_post">%s が @%s の投稿を共有しました</string>
+    <string name="dms_inbox_shared_image">%s が画像を共有しました</string>
+    <string name="dms_inbox_shared_video">%s がビデオを共有しました</string>
+    <string name="dms_inbox_shared_message">%s がメッセージを送信しました</string>
+    <string name="dms_inbox_shared_gif">%s がgifを共有しました</string>
+    <string name="dms_inbox_shared_sticker">%s がステッカーを共有しました</string>
+    <string name="dms_inbox_shared_profile">%s がプロフィールを共有しました: @%s</string>
+    <string name="dms_inbox_shared_location">%s が場所を共有しました: %s</string>
+    <string name="dms_inbox_shared_highlight">%s が @%s のストーリーのハイライトを共有しました</string>
+    <string name="dms_inbox_shared_story">%s が @%s のストーリーを共有しました</string>
+    <string name="dms_inbox_shared_voice">%s がボイスメッセージを送信しました</string>
+    <string name="dms_inbox_shared_clip">%s が @%s のクリップを共有しました</string>
+    <string name="dms_inbox_shared_igtv">%s が @%s のIGTVビデオを共有しました</string>
+    <string name="dms_inbox_replied_story_outgoing">次のストーリーに返信しました: %s</string>
+    <string name="dms_inbox_replied_story_incoming">%s があなたのストーリーに返信しました: %s</string>
+    <string name="dms_inbox_reacted_story_outgoing">次のストーリーに返信しました: %s</string>
+    <string name="dms_inbox_reacted_story_incoming">%s があなたのストーリーに返信しました: %s</string>
+    <string name="dms_inbox_mentioned_story_outgoing">ストーリーで @%s をメンションしました</string>
+    <string name="dms_inbox_mentioned_story_incoming">%s がストーリーであなたをメンションしました</string>
     <string name="dms_inbox_raven_media_unknown"><i>不明なメディアタイプ</i></string>
     <string name="dms_inbox_raven_media_expired">メディアの有効期限が切れました！</string>
     <string name="dms_inbox_raven_media_delivered">送信済み</string>
@@ -175,17 +179,17 @@
     <string name="dms_inbox_raven_media_suggested">おすすめ</string>
     <string name="dms_inbox_raven_media_screenshot">スクリーンショット撮影済み</string>
     <string name="dms_inbox_raven_media_cant_deliver">配信できません</string>
-    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
-    <string name="dms_thread_message_hint">Message...</string>
-    <string name="dms_thread_audio_hint">Press and hold to record audio</string>
-    <string name="dms_thread_updating">Updating...</string>
-    <string name="dms_action_leave">Leave chat</string>
+    <string name="dms_inbox_error_null_count">未読の返信はありません！</string>
+    <string name="dms_thread_message_hint">メッセージ...</string>
+    <string name="dms_thread_audio_hint">録音するには長押ししてください</string>
+    <string name="dms_thread_updating">更新中...</string>
+    <string name="dms_action_leave">チャットから退出する</string>
     <string name="dms_action_leave_question">チャットを終了しますか?</string>
     <string name="dms_action_kick">キックする</string>
     <string name="dms_left_users">退出したユーザー</string>
-    <string name="dms_ERROR_INVALID_USER">Invalid user</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_INVALID_USER">無効なユーザー</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">InstagramはDMで60秒以上の動画をアップロードすることを許可していません。</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">InstagramはDMで60秒以上の音声をアップロードすることを許可していません。</string>
     <string name="direct_download">直接ダウンロードする</string>
     <string name="direct_download_desc">投稿を直接ダウンロード！</string>
     <string name="direct_download_loading">投稿を取得中</string>
@@ -243,7 +247,7 @@
     <string name="activity_count_usertags">%d 個のタグ付け</string>
     <string name="activity_count_likes">%d いいね！</string>
     <string name="activity_count_poy">%d photos of you</string>
-    <string name="activity_count_requests">%d follow requests</string>
+    <string name="activity_count_requests">%d 件のフォローリクエスト</string>
     <string name="activity_notloggedin">この通知をクリックする前にログアウトしましたか？</string>
     <string name="feed">フィード</string>
     <string name="profile">ユーザー</string>
@@ -296,10 +300,10 @@
     <string name="apply">適用</string>
     <string name="save">保存</string>
     <string name="caption">キャプション</string>
-    <string name="edit_caption">Edit caption</string>
-    <string name="translate_caption">Translate caption</string>
+    <string name="edit_caption">キャプションを編集</string>
+    <string name="translate_caption">翻訳を見る</string>
     <string name="player_timeline_desc">ビデオプレーヤーのタイムライン</string>
-    <string name="liking">Liking…</string>
+    <string name="liking">いいね しています…</string>
     <string name="like_unsuccessful">いいね！に失敗しました</string>
     <string name="unlike_unsuccessful">いいね！の取消しに失敗しました</string>
     <string name="unliking">いいね！を取り消しています…</string>
@@ -333,28 +337,28 @@
     <string name="gallery">ギャラリー</string>
     <string name="camera">カメラ</string>
     <string name="all_photos">すべての写真</string>
-    <string name="all_media">All Media</string>
-    <string name="all_videos">All Videos</string>
-    <string name="brightness">Brightness</string>
-    <string name="contrast">Contrast</string>
-    <string name="vibrance">Vibrance</string>
-    <string name="saturation">Saturation</string>
-    <string name="sharpen">Sharpen</string>
-    <string name="exposure">Exposure</string>
-    <string name="center">Center</string>
-    <string name="color">Color</string>
-    <string name="start">Start</string>
-    <string name="end">End</string>
-    <string name="bilateral_blur">Bilateral Blur</string>
-    <string name="vignette">Vignette</string>
-    <string name="box_blur">Box blur</string>
+    <string name="all_media">すべてのメディア</string>
+    <string name="all_videos">すべてのビデオ</string>
+    <string name="brightness">明るさ</string>
+    <string name="contrast">コントラスト</string>
+    <string name="vibrance">露出</string>
+    <string name="saturation">彩度</string>
+    <string name="sharpen">シャープ</string>
+    <string name="exposure">露出</string>
+    <string name="center">中央</string>
+    <string name="color">色</string>
+    <string name="start">開始</string>
+    <string name="end">終了</string>
+    <string name="bilateral_blur">バイラテラルフィルター</string>
+    <string name="vignette">ビネット</string>
+    <string name="box_blur">ボックスぼかし</string>
     <string name="sepia">セピア</string>
-    <string name="clarendon">Clarendon</string>
+    <string name="clarendon">クラレンドン</string>
     <string name="one977">1977</string>
-    <string name="aden">Aden</string>
+    <string name="aden">アデン</string>
     <string name="reset">リセット</string>
     <string name="crop">トリミング</string>
-    <string name="normal">Normal</string>
+    <string name="normal">ノーマル</string>
     <plurals name="likes_count">
         <item quantity="other">%d いいね！</item>
     </plurals>
@@ -362,7 +366,7 @@
         <item quantity="other">%d コメント</item>
     </plurals>
     <plurals name="views_count">
-        <item quantity="other">%d views</item>
+        <item quantity="other">%d ビュー</item>
     </plurals>
     <plurals name="stories_count">
         <item quantity="other">%s ストーリー</item>
@@ -386,16 +390,16 @@
     <string name="tap_to_remove">タップして削除</string>
     <string name="forward">転送</string>
     <string name="forward_outgoing">メッセージを転送しました</string>
-    <string name="forward_incoming">Forwarded a message</string>
+    <string name="forward_incoming">メッセージを転送しました</string>
     <string name="add">追加</string>
     <string name="send">送信</string>
-    <string name="replying_to_yourself">Replying to yourself</string>
-    <string name="replying_to_user">Replying to %s</string>
-    <string name="replied_to_yourself">You replied to yourself</string>
-    <string name="replied_you">You replied</string>
-    <string name="replied_you_group">You replied to %s</string>
-    <string name="replied_group">Replied to %s</string>
-    <string name="replied_to_you">Replied to you</string>
+    <string name="replying_to_yourself">自分に返信しています</string>
+    <string name="replying_to_user">%s に返信しています</string>
+    <string name="replied_to_yourself">自分自身に返信しました</string>
+    <string name="replied_you">返信しました</string>
+    <string name="replied_you_group">%sに返信しました</string>
+    <string name="replied_group">%sに返信しました</string>
+    <string name="replied_to_you">あなたへの返信</string>
     <string name="replied_to_themself">Replied to themself</string>
     <string name="reacted_story_outgoing">You reacted to their story</string>
     <string name="reacted_story_incoming">Reacted to your story</string>
@@ -411,11 +415,11 @@
     <string name="raven_msg_info">Message will expire when seen</string>
     <string name="story_share">\@%s\'s story</string>
     <string name="story_share_highlight">\@%s\'s story highlight</string>
-    <string name="photo">Photo</string>
-    <string name="video">Video</string>
-    <string name="voice_message">Voice message</string>
-    <string name="post">Post</string>
-    <string name="approval_required_for_new_members">Approval required to join</string>
+    <string name="photo">写真</string>
+    <string name="video">ビデオ</string>
+    <string name="voice_message">ボイスメッセージ</string>
+    <string name="post">ポスト</string>
+    <string name="approval_required_for_new_members">参加には承認が必要です</string>
     <string name="requests">Requests</string>
     <string name="admins_only">Admins only</string>
     <string name="added_by">Added by %s</string>
@@ -425,7 +429,7 @@
     <string name="dms_action_end_question">End chat?</string>
     <string name="dms_action_end_description">All members will be removed from the group. They will still be able to view the chat history.</string>
     <string name="pending_requests">Pending Requests</string>
-    <string name="accept_request_from_user">Accept request from %1s (%2s)?</string>
+    <string name="accept_request_from_user">%1s (%2s) からのリクエストを承認しますか？</string>
     <string name="decline">Decline</string>
     <string name="accept">Accept</string>
     <string name="you">You</string>
@@ -433,22 +437,43 @@
     <string name="checking_for_new_messages">Checking for new messages</string>
     <string name="pref_category_stories">Stories</string>
     <string name="pref_category_dm">DM</string>
-    <string name="pref_category_notifications">Notifications</string>
-    <string name="pref_category_post">Post</string>
-    <string name="enable_dm_notifications">Enable DM notifications</string>
-    <string name="enable_dm_auto_refesh">Auto refresh messages</string>
-    <string name="auto_refresh_every">Auto refresh every</string>
-    <string name="secs">secs</string>
-    <string name="mins">mins</string>
-    <string name="search_giphy">Search GIPHY</string>
-    <string name="generic_null_response">Response is null!</string>
-    <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
+    <string name="pref_category_notifications">通知</string>
+    <string name="pref_category_post">ポスト</string>
+    <string name="enable_dm_notifications">DMの通知を有効にする</string>
+    <string name="enable_dm_auto_refesh">メッセージを自動更新する</string>
+    <string name="auto_refresh_every">自動更新する間隔</string>
+    <string name="secs">秒</string>
+    <string name="mins">分</string>
+    <string name="search_giphy">GIPHYを検索</string>
+    <string name="generic_null_response">返信がありません！</string>
+    <string name="generic_not_ok_response">返信のステータスが正しくありません！</string>
+    <string name="generic_failed_request">リクエストに失敗しました！</string>
+    <string name="hint_keyword">キーワード</string>
+    <string name="toggle_keyword_filter">キーワードフィルタを有効にする</string>
+    <string name="edit_keyword_filter">キーワードフィルタを編集する</string>
+    <string name="added_keywords">リストをフィルタするキーワード: %s を追加しました</string>
+    <string name="removed_keywords">リストをフィルタするキーワード: %s を削除しました</string>
     <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="delete_unsuccessful">削除に失敗しました</string>
+    <string name="throttle_error">APIリクエストが多すぎるためInstagramから制限を受けました。しばらく待ってから再試行してください。</string>
+    <string name="error">エラー</string>
+    <string name="account_logged_out">このアカウントはログアウトされました。</string>
+    <string name="login_required">ログインが必要です！</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">ユーザーは無効です！</string>
+    <string name="crash_report_subject">Barinstaクラッシュレポート</string>
+    <string name="crash_report_title">クラッシュログを送信するメールアプリを選択してください</string>
+    <string name="not_found">見つかりません！</string>
+    <string name="rate_limit">あなたのIPアドレスはInstagramによって制限されています。1時間待ってからもう一度お試しください。</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 80d8b915..85c0390c 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -23,6 +23,7 @@
     <string name="update_check">Check for updates at startup</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download posts to username folders</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
     <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
     <string name="dm_mark_as_seen_setting">Mark DM as seen after viewing</string>
diff --git a/app/src/main/res/values-mk/arrays.xml b/app/src/main/res/values-mk/arrays.xml
index 974c0995..98c7373a 100644
--- a/app/src/main/res/values-mk/arrays.xml
+++ b/app/src/main/res/values-mk/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>секунди</item>
         <item>минути</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index abb89551..eb99f7cb 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Провери за ажурирање</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Превземи објави во папката со кориснички имиња</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Означи ги приказните како видени</string>
     <string name="mark_as_seen_setting_summary">Авторот на приказната ќе знае дека сте ја погледнале приказната</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Означи порака како видена</string>
     <string name="dm_mark_as_seen_setting_summary">Другите членови ќе знаат дека сте ја виделе содржината на пораката</string>
     <string name="activity_setting">Овозможи нотификации</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nСледбеници</string>
     <string name="post_viewer_autoplay_video">Autoplay на видеа</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Секогаш гледај видеа без звук</string>
     <string name="post_viewer_show_captions">Секогаш прикажувај наслов</string>
     <string name="post_viewer_download_dialog_title">Одбери што сакаш да превземеш</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-nl/arrays.xml b/app/src/main/res/values-nl/arrays.xml
index a851e9bb..4fa7ccb6 100644
--- a/app/src/main/res/values-nl/arrays.xml
+++ b/app/src/main/res/values-nl/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fda4c863..8a0c1396 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Controleer op updates bij het opstarten</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download berichten naar gebruikersnaam mappen</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Markeer verhalen als gelezen na bekijken</string>
     <string name="mark_as_seen_setting_summary">Verhaalmaker zal het weten als je het bekeken hebt</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Markeer privéberichten als gelezen na bekijken</string>
     <string name="dm_mark_as_seen_setting_summary">Andere gebruikers zullen het weten als je het hebt bekeken</string>
     <string name="activity_setting">Activiteitmeldingen inschakelen</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nVolgend</string>
     <string name="post_viewer_autoplay_video">Video\'s automatisch afspelen</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Video\'s altijd dempen</string>
     <string name="post_viewer_show_captions">Always show post captions</string>
     <string name="post_viewer_download_dialog_title">Selecteer wat je wil downloaden</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-or/arrays.xml b/app/src/main/res/values-or/arrays.xml
index 26010439..05187416 100644
--- a/app/src/main/res/values-or/arrays.xml
+++ b/app/src/main/res/values-or/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>secs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index ce4427ec..5605e2a2 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">ଖୋଲିବା ସମୟରେ ଅପଡେଟ ପାଇଁ ଯାଞ୍ଚ କରନ୍ତୁ</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">ଡାଉନଲୋଡ ପୋଷ୍ଟକୁ ବ୍ୟବହାରକାରୀଙ୍କ ନାମରେ ହୋଇଥିବା ସ୍ଥାନ ରେ ରଖ</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">କାହାଣୀଗୁଡିକ ଦେଖିବା ପରେ \'ଦେଖାଗଲା\' ଚିହ୍ନିତ କରନ୍ତୁ |</string>
     <string name="mark_as_seen_setting_summary">କାହାଣୀ ପ୍ରେରକ ଜାଣିବେ ତୁମେ ଏହାକୁ ଦେଖିଛ</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">ବାର୍ତା ଦେଖିବା ପରେ \'ଦେଖାଗଲା\' ଚିହ୍ନିତ କରନ୍ତୁ |</string>
     <string name="dm_mark_as_seen_setting_summary">ଅନ୍ୟ ସଦସ୍ୟମାନେ ଜାଣିବେ ତୁମେ ଏହାକୁ ଦେଖିଛ।</string>
     <string name="activity_setting">କାର୍ଯ୍ୟକଳାପ ସୂଚନା ଦେଖାନ୍ତୁ</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nଅନୁସରଣ କରୁଛନ୍ତି</string>
     <string name="post_viewer_autoplay_video">ଭିଡ଼ିଓ ସ୍ୱତଃ ଚାଲୁ କର</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">ସର୍ବଦା ଭିଡ଼ିଓକୁ ଶବ୍ଦହୀନ ରଖ</string>
     <string name="post_viewer_show_captions">Always show post captions</string>
     <string name="post_viewer_download_dialog_title">ଡାଉନଲୋଡ଼ କରିବା ପାଇଁ ଚୟନ କରନ୍ତୁ</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-pl/arrays.xml b/app/src/main/res/values-pl/arrays.xml
index 1147bc83..a7e40411 100644
--- a/app/src/main/res/values-pl/arrays.xml
+++ b/app/src/main/res/values-pl/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>s.</item>
         <item>min.</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 93fb3ff8..e9dfd61e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Sprawdź aktualizacje przy starcie</string>
     <string name="flag_secure">Blokuj zrzuty ekranu &amp; podgląd aplikacji</string>
     <string name="download_user_folder">Pobierz posty do folderów o nazwie użytkownika</string>
+    <string name="download_prepend_username">Dodaj nazwę użytkownika do nazwy pliku</string>
     <string name="mark_as_seen_setting">Oznacz relacje jako widoczne po wyświetleniu</string>
     <string name="mark_as_seen_setting_summary">Autor relacji będzie widział, że to wyświetliłeś</string>
+    <string name="hide_muted_reels_setting">Ukryj wyciszone relacje z kanału</string>
     <string name="dm_mark_as_seen_setting">Oznacz wiadomość jako przeczytaną</string>
     <string name="dm_mark_as_seen_setting_summary">Inni użytkownicy będą wiedzieli, że to wyświetliłeś</string>
     <string name="activity_setting">Włącz powiadomienia o aktywności</string>
@@ -60,6 +62,8 @@
     </plurals>
     <string name="main_posts_following">%s\nobserwowanych</string>
     <string name="post_viewer_autoplay_video">Automatyczne odtwarzanie filmów</string>
+    <string name="post_viewer_background_play">Kontynuuj wideo w tle</string>
+    <string name="post_viewer_background_play_summary">Nie wstrzymuj filmów, gdy aplikacja jest nieaktywna</string>
     <string name="post_viewer_muted_autoplay">Zawsze wyciszaj filmy</string>
     <string name="post_viewer_show_captions">Zawsze pokazuj napisy postów</string>
     <string name="post_viewer_download_dialog_title">Wybierz, co chcesz pobrać</string>
@@ -468,11 +472,32 @@
     <string name="generic_null_response">Odpowiedź jest pusta!</string>
     <string name="generic_not_ok_response">Status odpowiedzi nie jest OK!</string>
     <string name="generic_failed_request">Żądanie nie powiodło się!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
+    <string name="hint_keyword">Słowo kluczowe</string>
+    <string name="toggle_keyword_filter">Włącz filtr słów kluczowych</string>
+    <string name="edit_keyword_filter">Edytuj filtry słów kluczowych</string>
+    <string name="added_keywords">Dodano słowo kluczowe: %s do listy filtrów</string>
+    <string name="removed_keywords">Usunięto słowo kluczowe: %s z listy filtrów</string>
     <string name="marked_as_seen">Oznacz jako przeczytane</string>
     <string name="delete_unsuccessful">Usuwanie nie powiodło się</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Błąd</string>
+    <string name="account_logged_out">To konto zostało wylogowane.</string>
+    <string name="login_required">Wymagane logowanie!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">Użytkownik jest nieaktywny!</string>
+    <string name="crash_report_subject">Raport awarii Barinsta</string>
+    <string name="crash_report_title">Wybierz aplikację e-mail do wysyłania dzienników awarii</string>
+    <string name="not_found">Nie znaleziono!</string>
+    <string name="rate_limit">Twój adres IP został ograniczony przez Instagram. Poczekaj godzinę i spróbuj ponownie.</string>
+    <string name="skip_update">Pomiń tę aktualizację</string>
+    <string name="on_latest_version">Posiadasz aktualną wersję</string>
+    <string name="tab_order">Kolejność na ekranie</string>
+    <string name="other_tabs">Inne karty</string>
+    <string name="tab_order_start_next_launch">Kolejność zakładek zostanie odzwierciedlona przy następnym uruchomieniu</string>
+    <string name="dm_remove_warning">Po zapisaniu wszystkie funkcje związane z PW zostaną wyłączone przy następnym uruchomieniu</string>
+    <string name="copy_caption">Kopiuj podpis</string>
+    <string name="copy_reply">Kopiuj odpowiedź</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-pt/arrays.xml b/app/src/main/res/values-pt/arrays.xml
index f7104787..fb832f13 100644
--- a/app/src/main/res/values-pt/arrays.xml
+++ b/app/src/main/res/values-pt/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>segs</item>
         <item>mins</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4c7bbbc4..b3e55d0f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -21,10 +21,12 @@
     <string name="title_comments">Comentários</string>
     <string name="title_notifications">Atividade</string>
     <string name="update_check">Verificar se há atualizações ao iniciar</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">Bloquear capturas de tela e a pré-visualização do aplicativo</string>
     <string name="download_user_folder">Baixar publicações para pastas com o nome de usuário</string>
+    <string name="download_prepend_username">Adicionar Nome de usuário ao Nome do arquivo</string>
     <string name="mark_as_seen_setting">Marcar stories como vistos após a visualização</string>
     <string name="mark_as_seen_setting_summary">O autor do story saberá que você viu</string>
+    <string name="hide_muted_reels_setting">Esconder stories silenciados do feed</string>
     <string name="dm_mark_as_seen_setting">Marcar DM como vista após a visualização</string>
     <string name="dm_mark_as_seen_setting_summary">Outros membros saberão que você viu</string>
     <string name="activity_setting">Ativar notificações de atividade</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nSeguindo</string>
     <string name="post_viewer_autoplay_video">Reprodução automática de vídeos</string>
+    <string name="post_viewer_background_play">Continuar vídeos em segundo plano</string>
+    <string name="post_viewer_background_play_summary">Não pausar vídeos quando o aplicativo está fora de foco</string>
     <string name="post_viewer_muted_autoplay">Sempre silenciar vídeos</string>
     <string name="post_viewer_show_captions">Sempre mostrar as legendas das publicações</string>
     <string name="post_viewer_download_dialog_title">Selecionar o que baixar</string>
@@ -213,7 +217,7 @@
     <string name="comment_view_mention_hash_search">Você quer buscar a hashtag?</string>
     <string name="followers_type_followers">Seguidores</string>
     <string name="followers_type_following">Seguindo</string>
-    <string name="followers_compare">Comparar seguidores</string>
+    <string name="followers_compare">Comparar seguidores e seguindo</string>
     <string name="followers_both_following">Ambos se seguem</string>
     <string name="followers_not_following">não segue %s</string>
     <string name="followers_not_follower">%s não segue</string>
@@ -452,11 +456,32 @@
     <string name="generic_null_response">A resposta é nula!</string>
     <string name="generic_not_ok_response">O estado da resposta não está correto!</string>
     <string name="generic_failed_request">A solicitação falhou!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="hint_keyword">Palavra-chave</string>
+    <string name="toggle_keyword_filter">Ativar filtro de palavras-chave</string>
+    <string name="edit_keyword_filter">Editar filtros de palavras-chave</string>
+    <string name="added_keywords">Palavra-chave adicionada: %s para a lista de filtros</string>
+    <string name="removed_keywords">Palavra-chave removida: %s da lista de filtros</string>
+    <string name="marked_as_seen">Marcado como visto</string>
+    <string name="delete_unsuccessful">Falha ao excluir</string>
+    <string name="throttle_error">Impedido pelo Instagram por causa de muitos pedidos da API. Espere algum tempo antes de tentar novamente.</string>
+    <string name="error">Erro</string>
+    <string name="account_logged_out">Esta conta foi desconectada.</string>
+    <string name="login_required">Login necessário!</string>
+    <string name="sentry_block">Sentry bloqueado.</string>
+    <string name="inactive_user">O usuário está inativo!</string>
+    <string name="crash_report_subject">Relatório de Travamento do Barinsta</string>
+    <string name="crash_report_title">Selecione um aplicativo de e-mail para enviar os registros de travamento</string>
+    <string name="not_found">Não encontrado!</string>
+    <string name="rate_limit">Seu IP foi limitado pelo Instagram. Espere uma hora e tente novamente.</string>
+    <string name="skip_update">Pular esta atualização</string>
+    <string name="on_latest_version">Você já está na versão mais recente</string>
+    <string name="tab_order">Ordem da tela</string>
+    <string name="other_tabs">Outras abas</string>
+    <string name="tab_order_start_next_launch">A ordem das abas será refletida no próximo início</string>
+    <string name="dm_remove_warning">Se salvo, todos os recursos relacionados a DM serão desativados no próximo início</string>
+    <string name="copy_caption">Copiar legenda</string>
+    <string name="copy_reply">Copiar resposta</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-ru/arrays.xml b/app/src/main/res/values-ru/arrays.xml
index 8fb04bad..8a7d9564 100644
--- a/app/src/main/res/values-ru/arrays.xml
+++ b/app/src/main/res/values-ru/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>секунды</item>
         <item>минуты</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b491a1c5..7aa1912a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,10 +21,12 @@
     <string name="title_comments">Комментарии</string>
     <string name="title_notifications">Активность</string>
     <string name="update_check">Проверять наличие обновлений при запуске</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">Блокировать скриншоты &amp; превью приложения</string>
     <string name="download_user_folder">Скачать публикации в папки с именем пользователя</string>
+    <string name="download_prepend_username">Добавить имя пользователя к имени файла</string>
     <string name="mark_as_seen_setting">Отметить истории как увиденные после просмотра</string>
     <string name="mark_as_seen_setting_summary">Автор истории узнает, что вы просмотрели её</string>
+    <string name="hide_muted_reels_setting">Скрыть заглушённые истории из ленты новостей</string>
     <string name="dm_mark_as_seen_setting">Отметить ЛС как увиденные после просмотра</string>
     <string name="dm_mark_as_seen_setting_summary">Другие участники узнают, что вы просмотрели его</string>
     <string name="activity_setting">Включить уведомления об активности</string>
@@ -60,6 +62,8 @@
     </plurals>
     <string name="main_posts_following">%s\nПоследователей</string>
     <string name="post_viewer_autoplay_video">Автовоспроизведение видео</string>
+    <string name="post_viewer_background_play">Воспроизведение видео в фоновом режиме</string>
+    <string name="post_viewer_background_play_summary">Не приостанавливать видео, когда приложение свернуто</string>
     <string name="post_viewer_muted_autoplay">Всегда заглушать видео</string>
     <string name="post_viewer_show_captions">Всегда отображать подписи к постам</string>
     <string name="post_viewer_download_dialog_title">Выберите, что скачивать</string>
@@ -187,7 +191,7 @@
     <string name="dms_inbox_raven_media_suggested">Предложено</string>
     <string name="dms_inbox_raven_media_screenshot">Сделан снимок экрана</string>
     <string name="dms_inbox_raven_media_cant_deliver">Не удаётся доставить</string>
-    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
+    <string name="dms_inbox_error_null_count">Количество непрочитанных сообщений неизвестно!</string>
     <string name="dms_thread_message_hint">Сообщение...</string>
     <string name="dms_thread_audio_hint">Нажмите и удерживайте, чтобы записать звук</string>
     <string name="dms_thread_updating">Обновление...</string>
@@ -270,7 +274,7 @@
     <string name="pref_start_screen">Начальный экран</string>
     <string name="pref_category_general">Общее</string>
     <string name="pref_category_theme">Тема</string>
-    <string name="pref_category_downloads">Скачивания</string>
+    <string name="pref_category_downloads">Загрузки</string>
     <string name="pref_category_locale">Локализация</string>
     <string name="account">Учётная запись</string>
     <string name="account_hint">Текущий вход не работает? Просто добавьте учётную запись снова.</string>
@@ -312,8 +316,8 @@
     <string name="translate_caption">Перевести подпись</string>
     <string name="player_timeline_desc">Лента времени видеопроигрывателя</string>
     <string name="liking">Нравится…</string>
-    <string name="like_unsuccessful">Нравится неудачно</string>
-    <string name="unlike_unsuccessful">Не нравится неудачно</string>
+    <string name="like_unsuccessful">Не удалось поставить лайк</string>
+    <string name="unlike_unsuccessful">Не удалось снять лайк</string>
     <string name="unliking">Отклонение…</string>
     <string name="controls">Управление</string>
     <string name="saving">Сохранение…</string>
@@ -404,7 +408,7 @@
     <string name="done">Готово</string>
     <string name="dms_action_make_admin">Сделать администратором</string>
     <string name="dms_action_remove_admin">Удалить администратора</string>
-    <string name="edit_unsuccessful">Ошибка при изменении</string>
+    <string name="edit_unsuccessful">Не удалось изменить</string>
     <string name="message">Сообщение</string>
     <string name="reply">Ответить</string>
     <string name="tap_to_remove">Нажмите для удаления</string>
@@ -468,11 +472,32 @@
     <string name="generic_null_response">Ответ пуст!</string>
     <string name="generic_not_ok_response">Ответный статус не в порядке!</string>
     <string name="generic_failed_request">Запрос не удался!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="hint_keyword">Ключевое слово</string>
+    <string name="toggle_keyword_filter">Включить фильтр по ключевым словам</string>
+    <string name="edit_keyword_filter">Редактировать фильтры ключевых слов</string>
+    <string name="added_keywords">Добавлено ключевое слово: %s в список фильтров</string>
+    <string name="removed_keywords">Удалено ключевое слово: %s из списка фильтров</string>
+    <string name="marked_as_seen">Отмечено как просмотренное</string>
+    <string name="delete_unsuccessful">Не удалось удалить</string>
+    <string name="throttle_error">Замято Instagram\'ом из-за слишком большого количества запросов API. Подождите некоторое время перед повторной попыткой.</string>
+    <string name="error">Ошибка</string>
+    <string name="account_logged_out">Эта учётная запись вышла из системы.</string>
+    <string name="login_required">Требуется вход в систему!</string>
+    <string name="sentry_block">Блокировка \"часового\".</string>
+    <string name="inactive_user">Пользователь неактивен!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Выберите приложение для отправки логов ошибки</string>
+    <string name="not_found">Не найдено!</string>
+    <string name="rate_limit">Ваш IP-адрес был ограничен Instagram. Подождите час и повторите попытку.</string>
+    <string name="skip_update">Пропустить это обновление</string>
+    <string name="on_latest_version">Вы уже используете последнюю версию</string>
+    <string name="tab_order">Порядок экрана</string>
+    <string name="other_tabs">Другие вкладки</string>
+    <string name="tab_order_start_next_launch">Порядок вкладок будет отражён при следующем запуске</string>
+    <string name="dm_remove_warning">При сохранении, все функции, связанные с ЛС, будут отключены при следующем запуске</string>
+    <string name="copy_caption">Копировать подпись</string>
+    <string name="copy_reply">Копировать ответ</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-sk/arrays.xml b/app/src/main/res/values-sk/arrays.xml
index 9e9535a2..2e5b71d2 100644
--- a/app/src/main/res/values-sk/arrays.xml
+++ b/app/src/main/res/values-sk/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>sekúnd</item>
         <item>minút</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f12178ec..55be2132 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Kontrolovať aktualizácie pri štarte</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Ukľadať do priečinkov podľa mena</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Označiť príbehy po videní ako videné</string>
     <string name="mark_as_seen_setting_summary">Autor príbehu bude vedieť že ste ho videli</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Po prečítaní, označiť správu ako prečítanú</string>
     <string name="dm_mark_as_seen_setting_summary">Ostatní budú vedieť že ste ho videli</string>
     <string name="activity_setting">Zapnúť notifikácie o aktivitách</string>
@@ -60,6 +62,8 @@
     </plurals>
     <string name="main_posts_following">%s\nSleduje</string>
     <string name="post_viewer_autoplay_video">Automaticky prehrávať videá</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Vždy stíšiť videá</string>
     <string name="post_viewer_show_captions">Vždy zobraziť popis príspevku</string>
     <string name="post_viewer_download_dialog_title">Vybrať čo stiahnuť</string>
@@ -475,4 +479,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-sv/arrays.xml b/app/src/main/res/values-sv/arrays.xml
new file mode 100644
index 00000000..4bdd3b70
--- /dev/null
+++ b/app/src/main/res/values-sv/arrays.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="languages">
+        <item>Systemstandard</item>
+        <item translatable="false">English</item>
+        <item translatable="false">Français</item>
+        <item translatable="false">Español</item>
+        <item translatable="false">简体中文</item>
+        <item translatable="false">Bahasa Indonesia</item>
+        <item translatable="false">Italiano</item>
+        <item translatable="false">Deutsch</item>
+        <item translatable="false">Polski</item>
+        <item translatable="false">Türkçe</item>
+        <item translatable="false">Português (Brasil)</item>
+        <item translatable="false">پارسی</item>
+        <item translatable="false">Македонски</item>
+        <item translatable="false">Tiếng Việt</item>
+        <item translatable="false">繁體中文</item>
+        <item translatable="false">Català</item>
+        <item translatable="false">Русский</item>
+        <item translatable="false">हिन्दी</item>
+        <item translatable="false">Nederlands</item>
+        <item translatable="false">Slovenčina</item>
+        <item translatable="false">日本語</item>
+        <item translatable="false">Ελληνικά</item>
+        <item translatable="false">Euskara</item>
+    </string-array>
+    <string-array name="theme_presets">
+        <item>Auto / Följ system</item>
+        <item>Auto / Följ batteri</item>
+        <item>Mörk</item>
+        <item>Ljus</item>
+    </string-array>
+    <string-array name="story_sorts">
+        <item>Instagram-standard (Olästa, sedan lästa)</item>
+        <item>Från nyaste till äldsta</item>
+        <item>Från äldsta till nyaste</item>
+    </string-array>
+    <string-array name="separator_presets">
+        <item>Ingen</item>
+        <item>\@</item>
+        <item>vid</item>
+        <item>den</item>
+        <item>\|</item>
+        <item>-</item>
+    </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
+    <string-array name="dm_auto_refresh_freq_units">
+        <item>sekunder</item>
+        <item>minuter</item>
+    </string-array>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000..067d45a8
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_about">Om</string>
+    <string name="action_dms">Direktmeddelanden</string>
+    <string name="action_settings">Inställningar</string>
+    <string name="action_download">Ladda ner</string>
+    <string name="action_search">Sök efter användarnamn…</string>
+    <string name="action_compare">Jämför</string>
+    <string name="clipboard_error">Fel uppstod när texten kopierades</string>
+    <string name="clipboard_copied">Kopierades till klippbordet!</string>
+    <string name="report">Rapportera</string>
+    <string name="set_password">Skydda fil med lösenord</string>
+    <string name="password_no_max">Lösenord</string>
+    <string name="ok">OK</string>
+    <string name="yes">Ja</string>
+    <string name="cancel">Avbryt</string>
+    <string name="no">Nej</string>
+    <string name="confirm">Bekräfta</string>
+    <string name="title_favorites">Favoriter</string>
+    <string name="title_discover">Upptäck</string>
+    <string name="title_comments">Kommentarer</string>
+    <string name="title_notifications">Aktivitet</string>
+    <string name="update_check">Sök efter uppdatering vid uppstart</string>
+    <string name="flag_secure">Blockera skärmdumpar &amp; förhandsgranskning av appen</string>
+    <string name="download_user_folder">Ladda ner inläggen till användarnamnets mappar</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
+    <string name="mark_as_seen_setting">Markera historier som sedda efter visning</string>
+    <string name="mark_as_seen_setting_summary">Berättelsens författare kommer att veta att du har sett den</string>
+    <string name="hide_muted_reels_setting">Göm historier utan ljud från flödet</string>
+    <string name="dm_mark_as_seen_setting">Markera DM som sedd efter visning</string>
+    <string name="dm_mark_as_seen_setting_summary">Andra medlemmar kommer att veta att du har sett den</string>
+    <string name="activity_setting">Aktivera aktivitetsaviseringar</string>
+    <string name="story_sort_setting">Sortering av historier i flödet</string>
+    <string name="error_loading_profile">Fel uppstod när profilen laddades! Är användarnamnet giltigt? Om det är det så kan du vara data-begränsad.</string>
+    <string name="error_loading_profile_loggedin">Fel uppstod när profilen laddades! Är användarnamnet giltigt? Eller blockerade de dig?</string>
+    <string name="error_loading_hashtag">Fel uppstod när hashtaggen laddades! Är namnet giltigt?</string>
+    <string name="error_loading_location">Fel uppstod när platsen laddades! Är URL:en giltig?</string>
+    <string name="error_creating_folders">Fel inträffade när mapp(arna) för nerladdning skapades.</string>
+    <string name="save_to_folder">Spara till en anpassad mapp</string>
+    <string name="select_folder">Select folder</string>
+    <string name="theme_settings">Theme</string>
+    <string name="login_settings">Only affects logged-in users:</string>
+    <string name="anonymous_settings">Only affects anonymous users:</string>
+    <string name="select_language">Language</string>
+    <plurals name="main_posts_count">
+        <item quantity="one">%s\nPost</item>
+        <item quantity="other">%s\nPosts</item>
+    </plurals>
+    <plurals name="main_posts_count_inline">
+        <item quantity="one">%s Post</item>
+        <item quantity="other">%s Posts</item>
+    </plurals>
+    <plurals name="main_posts_followers">
+        <item quantity="one">%s\nFollower</item>
+        <item quantity="other">%s\nFollowers</item>
+    </plurals>
+    <string name="main_posts_following">%s\nFollowing</string>
+    <string name="post_viewer_autoplay_video">Autoplay videos</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
+    <string name="post_viewer_muted_autoplay">Always mute videos</string>
+    <string name="post_viewer_show_captions">Always show post captions</string>
+    <string name="post_viewer_download_dialog_title">Select what to download</string>
+    <string name="post_viewer_download_current">Current</string>
+    <string name="post_viewer_download_album">Whole Album</string>
+    <string name="show_stories">Show stories</string>
+    <string name="no_more_stories">No more stories!</string>
+    <string name="be_patient">Be patient!</string>
+    <string name="view_story_post">View Post</string>
+    <string name="view_post">View Post</string>
+    <string name="spotify">Spotify</string>
+    <string name="vote_story_poll">Vote</string>
+    <string name="votef_story_poll">Vote successful!</string>
+    <string name="voted_story_poll">You have already voted!</string>
+    <string name="respond_story">Respond</string>
+    <string name="answer_hint">Answer…</string>
+    <string name="answered_story">Answer successful!</string>
+    <plurals name="slider_info" comment="For slider stickers in stories, eg. 3 responses averaging 17.38%">
+        <item quantity="one">%d response averaging %s</item>
+        <item quantity="other">%d responses averaging %s</item>
+    </plurals>
+    <string name="slider_answer">Your answer: %s</string>
+    <string name="reply_story">Reply to story</string>
+    <string name="reply_hint">Reply…</string>
+    <string name="story_quiz">Quiz</string>
+    <string name="story_slider">Slider</string>
+    <string name="story_quizzed">You have already answered!</string>
+    <string name="story_mentions">Mentions</string>
+    <string name="priv_acc">This Account is Private</string>
+    <string name="priv_acc_confirm">You won\'t be able to access posts after unfollowing! Are you sure?</string>
+    <string name="no_acc">You can log in via More -&gt; Account on the bottom-right corner or you can view public accounts without login!</string>
+    <string name="empty_acc">This Account has No Posts</string>
+    <string name="empty_list">No Such Posts!</string>
+    <string name="login">Login</string>
+    <string name="logout">Logout</string>
+    <string name="logout_summary">Browse Instagram anonymously</string>
+    <string name="remove_all_acc">Remove all accounts</string>
+    <string name="remove_all_acc_warning">This will remove all added accounts from the app!\nTo remove just one account, long tap the account from the account switcher dialog.\nDo you want to continue?</string>
+    <string name="time_settings">Date format</string>
+    <string name="saved_create_collection">Create new collection</string>
+    <string name="edit_collection">Edit collection name</string>
+    <string name="delete_collection">Ta bort samling</string>
+    <string name="delete_collection_confirm">Är du säker på att du vill ta bort den här samlingen?</string>
+    <string name="delete_collection_note">All contained media will remain in other collections.</string>
+    <string name="add_to_collection">Lägg till i samlingen...</string>
+    <string name="remove_from_collection">Ta bort från samling</string>
+    <string name="liked">Gillade</string>
+    <string name="saved">Sparade</string>
+    <string name="tagged">Taggade</string>
+    <string name="dm_person">Meddelande</string>
+    <string name="like_without_count">Gilla</string>
+    <string name="unlike_without_count">Sluta gilla</string>
+    <string name="bookmark">Bokmärk</string>
+    <string name="unbookmark">Ta bort bokmärke</string>
+    <string name="follow">Följ</string>
+    <string name="unfollow">Sluta följa</string>
+    <string name="favorite_short" comment="Adjective, not verb">Favorite</string>
+    <string name="block">Blockera</string>
+    <string name="unblock">Ta bort blockering</string>
+    <string name="restrict">Begränsa</string>
+    <string name="unrestrict">Ta bort begränsning</string>
+    <string name="mute_stories">Mute stories</string>
+    <string name="mute_posts">Mute posts</string>
+    <string name="unmute_stories">Unmute stories</string>
+    <string name="unmute_posts">Unmute posts</string>
+    <string name="bio_copy">Kopiera bio</string>
+    <string name="bio_translate">Översätt bio</string>
+    <string name="status_mutual">Ömsesidig</string>
+    <string name="status_following">Följer</string>
+    <string name="status_follower">Följare</string>
+    <string name="map">Karta</string>
+    <string name="dialog_export_accounts">Konton</string>
+    <string name="dialog_export_settings">Inställningar</string>
+    <string name="dialog_export_favorites">Favoriter</string>
+    <string name="dialog_import_success">Importeringen lyckades!</string>
+    <string name="dialog_import_failed">Importeringen misslyckades!</string>
+    <string name="dialog_export_success">Exportering lyckades!</string>
+    <string name="dialog_export_failed">Misslyckades med exportering!</string>
+    <string name="refresh">Uppdatera</string>
+    <string name="get_cookies">Hämta kakor</string>
+    <string name="desktop_2fa">Skrivbordsläge</string>
+    <string name="time_settings_title_custom">Använd anpassat format</string>
+    <string name="time_settings_title_separator">Avskiljare</string>
+    <string name="time_settings_title_time_format">Tidsformat</string>
+    <string name="time_settings_title_date_format">Datumformat</string>
+    <string name="time_settings_title_preview">Förhandsgranska</string>
+    <string name="time_settings_swap_time">Swap Time and Date positions</string>
+    <string name="quick_access_cannot_delete_curr">Cannot delete currently in use account</string>
+    <string name="quick_access_confirm_delete">Är du säker på att du vill ta bort \'%s\'?</string>
+    <string name="open_profile">Öppna profil</string>
+    <string name="view_story">View story</string>
+    <string name="view_pfp">View profile picture</string>
+    <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
+    <string name="dms_inbox_unsend">Unsend message</string>
+    <string name="dms_inbox_giphy">View on GIPHY</string>
+    <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
+    <string name="dms_inbox_shared_image">%s shared an image</string>
+    <string name="dms_inbox_shared_video">%s shared a video</string>
+    <string name="dms_inbox_shared_message">%s sent a message</string>
+    <string name="dms_inbox_shared_gif">%s shared a gif</string>
+    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
+    <string name="dms_inbox_shared_profile">%s shared a profile: @%s</string>
+    <string name="dms_inbox_shared_location">%s shared a location: %s</string>
+    <string name="dms_inbox_shared_highlight">%s shared a story highlight by @%s</string>
+    <string name="dms_inbox_shared_story">%s shared a story by @%s</string>
+    <string name="dms_inbox_shared_voice">%s sent a voice message</string>
+    <string name="dms_inbox_shared_clip">%s shared a clip by @%s</string>
+    <string name="dms_inbox_shared_igtv">%s shared an IGTV video by @%s</string>
+    <string name="dms_inbox_replied_story_outgoing">You replied to their story: %s</string>
+    <string name="dms_inbox_replied_story_incoming">%s replied to your story: %s</string>
+    <string name="dms_inbox_reacted_story_outgoing">You reacted to their story: %s</string>
+    <string name="dms_inbox_reacted_story_incoming">%s reacted to your story: %s</string>
+    <string name="dms_inbox_mentioned_story_outgoing">You mentioned @%s in your story</string>
+    <string name="dms_inbox_mentioned_story_incoming">%s mentioned you in their story</string>
+    <string name="dms_inbox_raven_media_unknown"><i>Unknown media type</i></string>
+    <string name="dms_inbox_raven_media_expired">Media expired!</string>
+    <string name="dms_inbox_raven_media_delivered">Delivered</string>
+    <string name="dms_inbox_raven_media_sent">Sent</string>
+    <string name="dms_inbox_raven_media_opened">Opened</string>
+    <string name="dms_inbox_raven_media_replayed">Replayed</string>
+    <string name="dms_inbox_raven_media_sending">Sending…</string>
+    <string name="dms_inbox_raven_media_blocked">Blocked</string>
+    <string name="dms_inbox_raven_media_suggested">Suggested</string>
+    <string name="dms_inbox_raven_media_screenshot">Screenshotted</string>
+    <string name="dms_inbox_raven_media_cant_deliver">Cannot deliver</string>
+    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
+    <string name="dms_thread_message_hint">Message...</string>
+    <string name="dms_thread_audio_hint">Press and hold to record audio</string>
+    <string name="dms_thread_updating">Updating...</string>
+    <string name="dms_action_leave">Leave chat</string>
+    <string name="dms_action_leave_question">Leave this chat?</string>
+    <string name="dms_action_kick">Kick</string>
+    <string name="dms_left_users">Left users</string>
+    <string name="dms_ERROR_INVALID_USER">Ogiltig användare</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram tillåter inte uppladdning av videor som är längre än 60 sekunder för DM.</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram tillåter inte uppladdning av ljud som är längre än 60 sekunder.</string>
+    <string name="direct_download">Ladda ner direkt</string>
+    <string name="direct_download_desc">Laddar ner inläggen direkt till telefonen!</string>
+    <string name="direct_download_loading">Hämtar inlägg(en)</string>
+    <string name="downloader_complete">Nerladdningen är färdig</string>
+    <string name="downloader_downloading_post">Laddar ner inlägg…</string>
+    <string name="downloader_downloading_media">Laddar ner media</string>
+    <string name="downloader_downloading_pfp">Laddar ner profilbild</string>
+    <string name="downloader_unknown_error">Okänt fel inträffade!!!</string>
+    <string name="downloader_error_creating_folder">Error creating folder!</string>
+    <string name="downloader_error_download_file">Error downloading file</string>
+    <string name="downloader_too_many">Du kan endast ladda ner 100 inlägg åt gången. Var inte för girig!</string>
+    <string name="comment_viewer_copy_comment">Kopiera kommentaren</string>
+    <string name="comment_viewer_see_likers">Visa gillare av kommentaren</string>
+    <string name="comment_viewer_reply_comment">Svara till kommentaren</string>
+    <string name="comment_viewer_like_comment">Gilla kommentaren</string>
+    <string name="comment_viewer_unlike_comment">Sluta gilla kommentaren</string>
+    <string name="comment_viewer_translate_comment">Översätt kommentaren</string>
+    <string name="comment_viewer_delete_comment">Ta bort kommentaren</string>
+    <string name="comment_send_empty_comment">Inga tomma kommentarer!</string>
+    <string name="comment_view_mention_user_search">Vill du söka på användarnamnet?</string>
+    <string name="comment_view_mention_hash_search">Vill du söka på hash-taggen?</string>
+    <string name="followers_type_followers">Följare</string>
+    <string name="followers_type_following">Följer</string>
+    <string name="followers_compare">Jämför följare &amp; följer</string>
+    <string name="followers_both_following">Båda två följer varandra</string>
+    <string name="followers_not_following">följer inte %s</string>
+    <string name="followers_not_follower">%s följer inte</string>
+    <string name="login_error_loading_cookies">Fel inträffade när kakorna laddades</string>
+    <string name="comment_hint">Skriv en ny kommentar…</string>
+    <string name="dm_hint">Skriv ett nytt meddelande…</string>
+    <string name="liked_notif">Gillade ditt inlägg</string>
+    <string name="comment_notif">Kommenterade ditt inlägg:</string>
+    <string name="follow_notif">Började att följa dig</string>
+    <string name="tagged_notif">Taggade dig i ett inlägg</string>
+    <string name="request_notif">Begärde att följa dig</string>
+    <string name="request_approve">Godkänn begäran</string>
+    <string name="request_reject">Neka begäran</string>
+    <string name="share_public_post">Dela det här publika inlägget till…</string>
+    <string name="share_private_post">This is a private post! Share to those who can view them!</string>
+    <string name="discover_empty">Den här kategorin är på något sätt tom…</string>
+    <string name="update_available">En uppdatering är tillgänglig! (%s)</string>
+    <string name="update_notice">Påminnelse: Om du har laddat ner från F-Droid så måste du uppdatera från det! Samma gäller från GitHub.</string>
+    <string name="updated">Tack för att du uppdaterar Barinsta!</string>
+    <string name="crash_title">Appen kraschade</string>
+    <string name="crash_descr">Hoppsan.. appen kraschade, men oroa dig inte. Du kan skicka felrapport till utvecklaren för att hjälpa honom att lösa problemet. (:</string>
+    <string name="action_notif">Aktivitet</string>
+    <string name="action_archive">Story archive</string>
+    <string name="action_ayml">Suggested users</string>
+    <string name="select_picture">Select Picture</string>
+    <string name="uploading">Uploading…</string>
+    <string name="activity_count_prefix">You have:</string>
+    <string name="activity_count_relationship">%d follows</string>
+    <string name="activity_count_comments">%d comments</string>
+    <string name="activity_count_commentlikes">%d comment likes</string>
+    <string name="activity_count_usertags">%d usertags</string>
+    <string name="activity_count_likes">%d likes</string>
+    <string name="activity_count_poy">%d photos of you</string>
+    <string name="activity_count_requests">%d follow requests</string>
+    <string name="activity_notloggedin">You logged out before clicking this notification?!</string>
+    <string name="feed">Feed</string>
+    <string name="profile">Profile</string>
+    <string name="more">More</string>
+    <string name="title_dm">DM</string>
+    <string name="number_selected">%d selected</string>
+    <string name="logout_success">Successfully logged out!</string>
+    <string name="dm_thread_info">Info</string>
+    <string name="mark_as_seen">Mark as seen</string>
+    <string name="skip_update_checkbox">Do not show again until next update</string>
+    <string name="version">Version</string>
+    <string name="pref_start_screen">Start screen</string>
+    <string name="pref_category_general">General</string>
+    <string name="pref_category_theme">Theme</string>
+    <string name="pref_category_downloads">Downloads</string>
+    <string name="pref_category_locale">Locale</string>
+    <string name="account">Account</string>
+    <string name="account_hint">Current login not working? Simply add the account again.</string>
+    <string name="add_account">Add account</string>
+    <string name="about_category_license">License (English only)</string>
+    <string name="about_documentation">Visit our website</string>
+    <string name="about_documentation_summary">Get support, discuss, meet others, and have fun!</string>
+    <string name="about_repository">See our source code on GitHub</string>
+    <string name="about_repository_summary">Audit, star, report bugs, contribute, and have fun (again)!</string>
+    <string name="about_feedback">Send feedback by email</string>
+    <string name="about_category_3pt">Third-Party Attributions</string>
+    <string name="reminder">Reminder</string>
+    <string name="reminder_summary">Please use this app responsibly. Downloaded images should only be used for purposes allowed by applicable laws.</string>
+    <string name="light_white_theme">White</string>
+    <string name="dark_black_theme">Black</string>
+    <string name="light_theme_settings">Light theme</string>
+    <string name="dark_theme_settings">Dark theme</string>
+    <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
+    <string name="dark_material_dark_theme">Material Dark</string>
+    <string name="added_to_favs">Lades till i Favoriter!</string>
+    <string name="add_to_favorites">Lades till i Favoriter</string>
+    <string name="accounts">Konton</string>
+    <string name="hashtags">Hash-taggar</string>
+    <string name="locations">Platser</string>
+    <string name="unknown">Okänd</string>
+    <string name="removed_from_favs">Togs bort från Favoriter!</string>
+    <string name="backup_and_restore">Säkerhetskopiera &amp; Återställ</string>
+    <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
+    <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>
+    <string name="create_backup">Create new backup file</string>
+    <string name="restore_backup">Restore from existing backup file</string>
+    <string name="file_chosen_label">Fil:</string>
+    <string name="enter_password">Fyll i lösenord</string>
+    <string name="select_backup_file">Välj en säkerhetskopieringsfil (.zaai/.backup)</string>
+    <string name="apply">Verkställ</string>
+    <string name="save">Spara</string>
+    <string name="caption">Bildtext</string>
+    <string name="edit_caption">Redigera bildtext</string>
+    <string name="translate_caption">Översätt bildtext</string>
+    <string name="player_timeline_desc">Tidslinje för videospelare</string>
+    <string name="liking">Gillar…</string>
+    <string name="like_unsuccessful">Like unsuccessful</string>
+    <string name="unlike_unsuccessful">Unlike unsuccessful</string>
+    <string name="unliking">Unliking…</string>
+    <string name="controls">Kontroller</string>
+    <string name="saving">Sparar…</string>
+    <string name="removing">Tar bort…</string>
+    <string name="save_unsuccessful">Save unsuccessful</string>
+    <string name="save_remove_unsuccessful">Remove unsuccessful</string>
+    <string name="downloading">Laddar ner…</string>
+    <string name="downloader_downloading_child">Ladda ner objekt %1$d av %2$d</string>
+    <string name="delete">Ta bort</string>
+    <string name="comment">Kommentera</string>
+    <string name="layout">Layout</string>
+    <string name="feed_stories">Feed stories</string>
+    <string name="opening_post">Öppnar inlägget...</string>
+    <string name="share">Dela</string>
+    <string name="layout_style">Layout style</string>
+    <string name="column_count">Column count</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="show_names">Visa namn</string>
+    <string name="show_avatars">Visa avatarer</string>
+    <string name="avatar_size">Avatarens storlek</string>
+    <string name="corners">Hörnen</string>
+    <string name="show_grid_gap">Show grid gap</string>
+    <string name="disable_animation">Stäng av animering</string>
+    <string name="follower_wait_to_load">Vänligen vänta på att den nuvarande uppgiften blir klar först!</string>
+    <string name="follower_start_compare">Depending on user counts, this can take a while to load. Please be patient.</string>
+    <string name="post_not_found">Inlägget hittades inte!</string>
+    <string name="no_external_app_url">Ingen app som öppnar webbadresser hittades</string>
+    <string name="gallery">Gallery</string>
+    <string name="camera">Camera</string>
+    <string name="all_photos">All Photos</string>
+    <string name="all_media">All Media</string>
+    <string name="all_videos">All Videos</string>
+    <string name="brightness">Brightness</string>
+    <string name="contrast">Contrast</string>
+    <string name="vibrance">Vibrance</string>
+    <string name="saturation">Saturation</string>
+    <string name="sharpen">Sharpen</string>
+    <string name="exposure">Exposure</string>
+    <string name="center">Center</string>
+    <string name="color">Color</string>
+    <string name="start">Start</string>
+    <string name="end">End</string>
+    <string name="bilateral_blur">Bilateral Blur</string>
+    <string name="vignette">Vignette</string>
+    <string name="box_blur">Box blur</string>
+    <string name="sepia">Sepia</string>
+    <string name="clarendon">Clarendon</string>
+    <string name="one977">1977</string>
+    <string name="aden">Aden</string>
+    <string name="reset">Reset</string>
+    <string name="crop">Crop</string>
+    <string name="normal">Normal</string>
+    <plurals name="likes_count">
+        <item quantity="one">%d like</item>
+        <item quantity="other">%d likes</item>
+    </plurals>
+    <plurals name="comments_count">
+        <item quantity="one">%d comment</item>
+        <item quantity="other">%d comments</item>
+    </plurals>
+    <plurals name="views_count">
+        <item quantity="one">%d view</item>
+        <item quantity="other">%d views</item>
+    </plurals>
+    <plurals name="stories_count">
+        <item quantity="one">%s story</item>
+        <item quantity="other">%s stories</item>
+    </plurals>
+    <string name="download_permission">Storage permission not granted!</string>
+    <string name="details">Details</string>
+    <string name="title">Title</string>
+    <string name="members">Members</string>
+    <string name="admin">Admin</string>
+    <string name="inviter">Inviter</string>
+    <string name="mute_messages">Mute messages</string>
+    <string name="mute_mentions">Mute mentions</string>
+    <string name="add_members">Lägg till meddlemmar</string>
+    <string name="search">Sök</string>
+    <string name="done">Färdig</string>
+    <string name="dms_action_make_admin">Gör till admin</string>
+    <string name="dms_action_remove_admin">Ta bort som admin</string>
+    <string name="edit_unsuccessful">Redigeringen lyckades inte</string>
+    <string name="message">Meddelande</string>
+    <string name="reply">Svara</string>
+    <string name="tap_to_remove">Tryck för att ta bort</string>
+    <string name="forward">Vidarebefordra</string>
+    <string name="forward_outgoing">Du vidarebefordrade ett meddelande</string>
+    <string name="forward_incoming">Vidarebefordrade ett meddelande</string>
+    <string name="add">Lägg till</string>
+    <string name="send">Skicka</string>
+    <string name="replying_to_yourself">Svarar till dig själv</string>
+    <string name="replying_to_user">Svarar till %s</string>
+    <string name="replied_to_yourself">Du svarade till dig själv</string>
+    <string name="replied_you">Du svarade</string>
+    <string name="replied_you_group">Du svarade till %s</string>
+    <string name="replied_group">Svarade till %s</string>
+    <string name="replied_to_you">Svarade till dig</string>
+    <string name="replied_to_themself">Svarade till sig själva</string>
+    <string name="reacted_story_outgoing">Du reagerade på deras historia</string>
+    <string name="reacted_story_incoming">Reagerade på din historia</string>
+    <string name="mentioned_story_outgoing">You mentioned them in your story</string>
+    <string name="mentioned_story_incoming">Mentioned you in their story</string>
+    <string name="replied_story_outgoing">You replied to their story</string>
+    <string name="replied_story_incoming">Replied to your story</string>
+    <string name="raven_image_expired">Image has expired</string>
+    <string name="raven_image_info">Image will expire when seen</string>
+    <string name="raven_video_expired">Video has expired</string>
+    <string name="raven_video_info">Video will expire when seen</string>
+    <string name="raven_msg_expired">Message has expired</string>
+    <string name="raven_msg_info">Message will expire when seen</string>
+    <string name="story_share">\@%s\'s story</string>
+    <string name="story_share_highlight">\@%s\'s story highlight</string>
+    <string name="photo">Photo</string>
+    <string name="video">Video</string>
+    <string name="voice_message">Voice message</string>
+    <string name="post">Post</string>
+    <string name="approval_required_for_new_members">Approval required to join</string>
+    <string name="requests">Requests</string>
+    <string name="admins_only">Admins only</string>
+    <string name="added_by">Added by %s</string>
+    <string name="admin_approval_required">Admin approval required</string>
+    <string name="admin_approval_required_description">An admin approval will be required to add new members to the group</string>
+    <string name="dms_action_end">End chat</string>
+    <string name="dms_action_end_question">End chat?</string>
+    <string name="dms_action_end_description">All members will be removed from the group. They will still be able to view the chat history.</string>
+    <string name="pending_requests">Pending Requests</string>
+    <string name="accept_request_from_user">Accept request from %1s (%2s)?</string>
+    <string name="decline">Decline</string>
+    <string name="accept">Accept</string>
+    <string name="you">You</string>
+    <string name="no_pending_requests">No pending requests</string>
+    <string name="checking_for_new_messages">Checking for new messages</string>
+    <string name="pref_category_stories">Stories</string>
+    <string name="pref_category_dm">DM</string>
+    <string name="pref_category_notifications">Notifications</string>
+    <string name="pref_category_post">Post</string>
+    <string name="enable_dm_notifications">Enable DM notifications</string>
+    <string name="enable_dm_auto_refesh">Auto refresh messages</string>
+    <string name="auto_refresh_every">Auto refresh every</string>
+    <string name="secs">secs</string>
+    <string name="mins">mins</string>
+    <string name="search_giphy">Search GIPHY</string>
+    <string name="generic_null_response">Response is null!</string>
+    <string name="generic_not_ok_response">Response status is not ok!</string>
+    <string name="generic_failed_request">Request failed!</string>
+    <string name="hint_keyword">Keyword</string>
+    <string name="toggle_keyword_filter">Enable keyword filter</string>
+    <string name="edit_keyword_filter">Edit keyword filters</string>
+    <string name="added_keywords">Added keyword: %s to filter list</string>
+    <string name="removed_keywords">Removed keyword: %s from filter list</string>
+    <string name="marked_as_seen">Marked as seen</string>
+    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
+</resources>
diff --git a/app/src/main/res/values-tr/arrays.xml b/app/src/main/res/values-tr/arrays.xml
index e87f4cd1..d1cc9560 100644
--- a/app/src/main/res/values-tr/arrays.xml
+++ b/app/src/main/res/values-tr/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>saniye</item>
         <item>dakika</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 4ca6836d..b11816d8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">Güncellemeleri başlangıçta kontrol et</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">İndirmeleri kullanıcı adından oluşan bir alt klasörün içine yap</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Hikayeleri gördükten sonra görüldü olarak işaretle</string>
     <string name="mark_as_seen_setting_summary">Hikayeyi paylaşan gördüğünüzü bilecek</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">DM\'leri gördükten sonra görüldü olarak işaretle</string>
     <string name="dm_mark_as_seen_setting_summary">Diğerleri gördüğünüzü bilecek</string>
     <string name="activity_setting">Hareketler için bildirimleri aktifleştir</string>
@@ -54,6 +56,8 @@
     </plurals>
     <string name="main_posts_following">%s\nTakip</string>
     <string name="post_viewer_autoplay_video">Videoları otomatik oynat</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Videoları her zaman sustur</string>
     <string name="post_viewer_show_captions">Gönderi başlıklarını her zaman göster</string>
     <string name="post_viewer_download_dialog_title">İndirmek için seçin</string>
@@ -459,4 +463,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-vi/arrays.xml b/app/src/main/res/values-vi/arrays.xml
index c45da5ac..97d23d29 100644
--- a/app/src/main/res/values-vi/arrays.xml
+++ b/app/src/main/res/values-vi/arrays.xml
@@ -32,9 +32,9 @@
         <item>Sáng</item>
     </string-array>
     <string-array name="story_sorts">
-        <item>Instagram default (Unread then read)</item>
-        <item>From newest to oldest</item>
-        <item>From oldest to newest</item>
+        <item>Mặc định của Instagram (chưa đọc rồi đọc)</item>
+        <item>Mới nhất đến cũ nhất</item>
+        <item>Cũ nhất đến mới nhất</item>
     </string-array>
     <string-array name="separator_presets">
         <item>Không</item>
@@ -44,8 +44,17 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
-        <item>secs</item>
-        <item>mins</item>
+        <item>giây</item>
+        <item>phút</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index debb92fc..1c6a26a3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -9,7 +9,7 @@
     <string name="clipboard_error">Lỗi khi sao chép</string>
     <string name="clipboard_copied">Đã sao chép vào clipboard!</string>
     <string name="report">Báo cáo</string>
-    <string name="set_password">Protect file with password</string>
+    <string name="set_password">Bảo vệ file với mật khẩu</string>
     <string name="password_no_max">Mật khẩu</string>
     <string name="ok">OK</string>
     <string name="yes">Có</string>
@@ -21,18 +21,20 @@
     <string name="title_comments">Bình luận</string>
     <string name="title_notifications">Hoạt động</string>
     <string name="update_check">Kiểm tra cập nhật khi khởi động</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">Chặn chụp ảnh màn hình &amp; xem trước ứng dụng</string>
     <string name="download_user_folder">Tải bài viết xuống theo thư mục tên người dùng trong Downloads</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Đánh dấu story là đã xem sau khi xem</string>
     <string name="mark_as_seen_setting_summary">Người đăng story sẽ biết bạn đã xem nó</string>
+    <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
     <string name="dm_mark_as_seen_setting">Đánh dấu DM là đã xem sau khi xem</string>
     <string name="dm_mark_as_seen_setting_summary">Những thành viên khác sẽ biết bạn đã xem nó</string>
     <string name="activity_setting">Kích hoạt thông báo hoạt động</string>
-    <string name="story_sort_setting">Feed stories sort</string>
-    <string name="error_loading_profile">Error loading profile! Is the username valid? If so, you may be ratelimited.</string>
-    <string name="error_loading_profile_loggedin">Error loading profile! Is the username valid? Or did they block you?</string>
-    <string name="error_loading_hashtag">Error loading hashtag! Is the name valid?</string>
-    <string name="error_loading_location">Error loading location! Is the URL valid?</string>
+    <string name="story_sort_setting">Sắp xếp câu chuyện trên bảng tin</string>
+    <string name="error_loading_profile">Tải hồ sơ thất bại! Tên người dùng có đúng chưa? Nếu đúng, có thể bạn đã bị giới hạn.</string>
+    <string name="error_loading_profile_loggedin">Họ có chặn bạn không?</string>
+    <string name="error_loading_hashtag">Tải hashtag thất bại! Tên đã đúng chứ?</string>
+    <string name="error_loading_location">Tải vị trí thất bại! URL đã đúng chưa?</string>
     <string name="error_creating_folders">Lỗi khi tạo thư mục Download.</string>
     <string name="save_to_folder">Lưu vào thư mục tùy chọn</string>
     <string name="select_folder">Chọn thư mục</string>
@@ -51,9 +53,11 @@
     </plurals>
     <string name="main_posts_following">%s\nĐang theo dõi</string>
     <string name="post_viewer_autoplay_video">Tự động phát video</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Luôn luôn tắt âm thanh video</string>
-    <string name="post_viewer_show_captions">Always show post captions</string>
-    <string name="post_viewer_download_dialog_title">Chọn cái để tải xuống</string>
+    <string name="post_viewer_show_captions">Luôn hiển thị tiêu đề của bài viết</string>
+    <string name="post_viewer_download_dialog_title">Chọn mục tải xuống</string>
     <string name="post_viewer_download_current">Hiện tại</string>
     <string name="post_viewer_download_album">Cả album</string>
     <string name="show_stories">Hiện story</string>
@@ -89,13 +93,13 @@
     <string name="remove_all_acc">Xóa tất cả tài khoản</string>
     <string name="remove_all_acc_warning">Điều này sẽ xóa tất cả tài khoản đã thêm vào ứng dụng!\nĐể xóa một tài khoản duy nhất, nhấn giữ vào tài khoản đó trong mục đổi tài khoản.\nBạn có muốn tiếp tục không?</string>
     <string name="time_settings">Định dạng ngày tháng</string>
-    <string name="saved_create_collection">Create new collection</string>
-    <string name="edit_collection">Edit collection name</string>
-    <string name="delete_collection">Delete collection</string>
-    <string name="delete_collection_confirm">Are you sure you want to delete this collection?</string>
-    <string name="delete_collection_note">All contained media will remain in other collections.</string>
-    <string name="add_to_collection">Add to collection...</string>
-    <string name="remove_from_collection">Remove from collection</string>
+    <string name="saved_create_collection">Tạo bộ sưu tập mới</string>
+    <string name="edit_collection">Chỉnh sửa tên bộ sưu tập</string>
+    <string name="delete_collection">Xoá bộ sưu tập</string>
+    <string name="delete_collection_confirm">Bạn có chắc muốn xoá bộ sưu tập này chứ?</string>
+    <string name="delete_collection_note">Tất cả những phương tiện đã lưu sẽ được giữ lại trong bộ sưu tập khác.</string>
+    <string name="add_to_collection">Thêm vào bộ sưu tập...</string>
+    <string name="remove_from_collection">Xoá khỏi bộ sưu tập</string>
     <string name="liked">Đã thích</string>
     <string name="saved">Đã lưu</string>
     <string name="tagged">Đã gắn thẻ</string>
@@ -111,15 +115,15 @@
     <string name="unblock">Bỏ chặn</string>
     <string name="restrict">Giới hạn</string>
     <string name="unrestrict">Bỏ giới hạn</string>
-    <string name="mute_stories">Mute stories</string>
-    <string name="mute_posts">Mute posts</string>
-    <string name="unmute_stories">Unmute stories</string>
-    <string name="unmute_posts">Unmute posts</string>
-    <string name="bio_copy">Copy bio</string>
-    <string name="bio_translate">Translate bio</string>
-    <string name="status_mutual">Mutual</string>
-    <string name="status_following">Following</string>
-    <string name="status_follower">Follower</string>
+    <string name="mute_stories">Chặn story</string>
+    <string name="mute_posts">Chặn bài đăng</string>
+    <string name="unmute_stories">Bỏ chặn story</string>
+    <string name="unmute_posts">Bỏ chặn bài đăng</string>
+    <string name="bio_copy">Sao chép thông tin</string>
+    <string name="bio_translate">Dịch thông tin</string>
+    <string name="status_mutual">Chung</string>
+    <string name="status_following">Đang theo dõi</string>
+    <string name="status_follower">Người theo dõi</string>
     <string name="map">Bản đồ</string>
     <string name="dialog_export_accounts">Tài khoản</string>
     <string name="dialog_export_settings">Cài đặt</string>
@@ -140,29 +144,29 @@
     <string name="quick_access_cannot_delete_curr">Không thể xóa tài khoản đang được sử dụng</string>
     <string name="quick_access_confirm_delete">Bạn có chắc bạn muốn xóa \'%s\'?</string>
     <string name="open_profile">Mở hồ sơ</string>
-    <string name="view_story">View story</string>
+    <string name="view_story">Xem story</string>
     <string name="view_pfp">Xem Ảnh Đại Diện</string>
-    <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
+    <string name="dms_inbox_raven_message_unknown">Dạng tin nhắn không được hỗ trợ</string>
     <string name="dms_inbox_unsend">Gỡ tin nhắn</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
-    <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
-    <string name="dms_inbox_shared_image">%s shared an image</string>
-    <string name="dms_inbox_shared_video">%s shared a video</string>
-    <string name="dms_inbox_shared_message">%s sent a message</string>
-    <string name="dms_inbox_shared_gif">%s shared a gif</string>
-    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
-    <string name="dms_inbox_shared_profile">%s shared a profile: @%s</string>
-    <string name="dms_inbox_shared_location">%s shared a location: %s</string>
-    <string name="dms_inbox_shared_highlight">%s shared a story highlight by @%s</string>
-    <string name="dms_inbox_shared_story">%s shared a story by @%s</string>
-    <string name="dms_inbox_shared_voice">%s sent a voice message</string>
-    <string name="dms_inbox_shared_clip">%s shared a clip by @%s</string>
-    <string name="dms_inbox_shared_igtv">%s shared an IGTV video by @%s</string>
-    <string name="dms_inbox_replied_story_outgoing">You replied to their story: %s</string>
-    <string name="dms_inbox_replied_story_incoming">%s replied to your story: %s</string>
-    <string name="dms_inbox_reacted_story_outgoing">You reacted to their story: %s</string>
-    <string name="dms_inbox_reacted_story_incoming">%s reacted to your story: %s</string>
-    <string name="dms_inbox_mentioned_story_outgoing">You mentioned @%s in your story</string>
+    <string name="dms_inbox_giphy">Xem trên GIPHY</string>
+    <string name="dms_inbox_shared_post">%s đã chia sẻ bài viết của @%s</string>
+    <string name="dms_inbox_shared_image">%s đã chia sẻ một bức ảnh</string>
+    <string name="dms_inbox_shared_video">%s đã chia sẻ một video</string>
+    <string name="dms_inbox_shared_message">%s đã gửi một tin nhắn</string>
+    <string name="dms_inbox_shared_gif">%s đã chia sẻ một ảnh động</string>
+    <string name="dms_inbox_shared_sticker">%s đã chia sẻ một sticker</string>
+    <string name="dms_inbox_shared_profile">%s đã chia sẻ một hồ sơ: @%s</string>
+    <string name="dms_inbox_shared_location">%s% đã chia sẻ vị trí: %s</string>
+    <string name="dms_inbox_shared_highlight">%s đã chia sẻ một story highlight của @%s</string>
+    <string name="dms_inbox_shared_story">%s đã chia sẻ một story của @%s</string>
+    <string name="dms_inbox_shared_voice">%s đã gửi một tin nhắn thoại</string>
+    <string name="dms_inbox_shared_clip">%s đã chia sẻ một đoạn clip của @%s</string>
+    <string name="dms_inbox_shared_igtv">%s đã chia sẻ một đoạn video IGTV của @%s</string>
+    <string name="dms_inbox_replied_story_outgoing">Bạn đã phản hồi story của họ: %s</string>
+    <string name="dms_inbox_replied_story_incoming">%s đã phản hồi story của bạn: %s</string>
+    <string name="dms_inbox_reacted_story_outgoing">Bạn đã bày tỏ cảm xúc story của họ: %s</string>
+    <string name="dms_inbox_reacted_story_incoming">%s đã bày tỏ cảm xúc story của bạn: %s</string>
+    <string name="dms_inbox_mentioned_story_outgoing">Bạn đã gắn thẻ @%s trong story của mình</string>
     <string name="dms_inbox_mentioned_story_incoming">%s mentioned you in their story</string>
     <string name="dms_inbox_raven_media_unknown"><i>Phương tiện không xác định</i></string>
     <string name="dms_inbox_raven_media_expired">Phương tiện đã hết hạn!</string>
@@ -451,4 +455,25 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
+    <string name="crash_report_subject">Barinsta Crash Report</string>
+    <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
+    <string name="skip_update">Skip this update</string>
+    <string name="on_latest_version">You\'re already on the latest version</string>
+    <string name="tab_order">Screen order</string>
+    <string name="other_tabs">Other tabs</string>
+    <string name="tab_order_start_next_launch">The tab order will be reflected on next launch</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/arrays.xml b/app/src/main/res/values-zh-rCN/arrays.xml
index 667cd83a..9a8d9fd0 100644
--- a/app/src/main/res/values-zh-rCN/arrays.xml
+++ b/app/src/main/res/values-zh-rCN/arrays.xml
@@ -44,6 +44,15 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
         <item>秒</item>
         <item>分</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a6fe9c77..111324f5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,8 +23,10 @@
     <string name="update_check">启动时检查更新</string>
     <string name="flag_secure">屏蔽截图及应用预览</string>
     <string name="download_user_folder">下载帖子到用户名文件夹</string>
+    <string name="download_prepend_username">在文件名前添加用户名</string>
     <string name="mark_as_seen_setting">查看快拍后将其标记为已读</string>
     <string name="mark_as_seen_setting_summary">快拍作者会知道您已看过</string>
+    <string name="hide_muted_reels_setting">动态隐藏静音快拍</string>
     <string name="dm_mark_as_seen_setting">查看私信后将其标记为已读</string>
     <string name="dm_mark_as_seen_setting_summary">其他成员会知道你看过了</string>
     <string name="activity_setting">启用活动通知</string>
@@ -51,9 +53,11 @@
     </plurals>
     <string name="main_posts_following">%s\n已关注</string>
     <string name="post_viewer_autoplay_video">自动播放视频</string>
+    <string name="post_viewer_background_play">在后台继续播放视频</string>
+    <string name="post_viewer_background_play_summary">隐藏应用画面（锁屏、切换应用…）时不暂停视频</string>
     <string name="post_viewer_muted_autoplay">视频默认静音</string>
     <string name="post_viewer_show_captions">总是显示帖子标题</string>
-    <string name="post_viewer_download_dialog_title">选择要下载的</string>
+    <string name="post_viewer_download_dialog_title">选择要下载的内容</string>
     <string name="post_viewer_download_current">当前照片</string>
     <string name="post_viewer_download_album">整个图集</string>
     <string name="show_stories">显示快拍</string>
@@ -444,11 +448,32 @@
     <string name="generic_null_response">回应为空！</string>
     <string name="generic_not_ok_response">回应状态错误！</string>
     <string name="generic_failed_request">请求失败</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
+    <string name="hint_keyword">关键词</string>
+    <string name="toggle_keyword_filter">启用关键词过滤器</string>
+    <string name="edit_keyword_filter">编辑关键词过滤器</string>
+    <string name="added_keywords">已添加关键词: %s 至过滤列表</string>
+    <string name="removed_keywords">已移除关键词: %s 至过滤列表</string>
     <string name="marked_as_seen">已标记为已读</string>
     <string name="delete_unsuccessful">删除失败</string>
+    <string name="throttle_error">您发送的API请求过多。请等待一段时间后重试。</string>
+    <string name="error">错误</string>
+    <string name="account_logged_out">您已经退出。</string>
+    <string name="login_required">需要登录！</string>
+    <string name="sentry_block">Sentry 故障。</string>
+    <string name="inactive_user">账户已冻结！</string>
+    <string name="crash_report_subject">Barinsta 崩溃报告</string>
+    <string name="crash_report_title">选择一个电子邮件应用来发送崩溃日志</string>
+    <string name="not_found">未找到所要的内容！</string>
+    <string name="rate_limit">您的IP地址已被 Instagram 设限。请等待一个小时后重试。</string>
+    <string name="skip_update">跳过本次更新</string>
+    <string name="on_latest_version">您现在安装的是最新版本</string>
+    <string name="tab_order">页面顺序</string>
+    <string name="other_tabs">其它页面</string>
+    <string name="tab_order_start_next_launch">页面顺序将在下次启动时生效</string>
+    <string name="dm_remove_warning">若您如此保存，所有私信功能将会在下次启动时被禁用</string>
+    <string name="copy_caption">复制说明</string>
+    <string name="copy_reply">复制回复</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/arrays.xml b/app/src/main/res/values-zh-rTW/arrays.xml
index 2b82c66e..8bfea859 100644
--- a/app/src/main/res/values-zh-rTW/arrays.xml
+++ b/app/src/main/res/values-zh-rTW/arrays.xml
@@ -44,8 +44,17 @@
         <item>\|</item>
         <item>-</item>
     </string-array>
+    <!-- Nav graphs should correspond 1-to-1 with the above nav graph ids -->
+    <!-- Titles should correspond 1-to-1 with the above nav graphs -->
+    <!-- Drawable should correspond 1-to-1 with the above titles -->
+    <!-- fragmentIds should correspond 1-to-1 with the above drawabled -->
+    <!-- these are the start destination of the corresponding nav graphs -->
+    <!--<array name="logged_out_main_nav_graphs">-->
+    <!--    <item>@navigation/profile_nav_graph</item>-->
+    <!--    <item>@navigation/more_nav_graph</item>-->
+    <!--</array>-->
     <string-array name="dm_auto_refresh_freq_units">
-        <item>secs</item>
-        <item>mins</item>
+        <item>秒</item>
+        <item>分</item>
     </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 26371e94..714f072c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,7 +9,7 @@
     <string name="clipboard_error">複製文字時出錯</string>
     <string name="clipboard_copied">已複製至剪貼簿！</string>
     <string name="report">回報</string>
-    <string name="set_password">Protect file with password</string>
+    <string name="set_password">使用密碼保護備份</string>
     <string name="password_no_max">密碼</string>
     <string name="ok">確定</string>
     <string name="yes">是</string>
@@ -21,18 +21,20 @@
     <string name="title_comments">評論</string>
     <string name="title_notifications">動態</string>
     <string name="update_check">啟動時檢查更新</string>
-    <string name="flag_secure">Block screenshots &amp; app preview</string>
+    <string name="flag_secure">阻擋截圖 &amp; 應用程式預覽</string>
     <string name="download_user_folder">將貼文下載到用戶名資料夾</string>
+    <string name="download_prepend_username">在檔案名稱前添加用戶名</string>
     <string name="mark_as_seen_setting">檢視完限時動態後標記為已讀</string>
     <string name="mark_as_seen_setting_summary">限時動態的作者會知道您已查看了此限時動態</string>
+    <string name="hide_muted_reels_setting">隱藏已隱藏的限時動態</string>
     <string name="dm_mark_as_seen_setting">檢視完訊息後標記為已讀</string>
     <string name="dm_mark_as_seen_setting_summary">其他成員會知道您查看了此訊息</string>
     <string name="activity_setting">啟用活動通知</string>
     <string name="story_sort_setting">動態貼文排序</string>
-    <string name="error_loading_profile">Error loading profile! Is the username valid? If so, you may be ratelimited.</string>
-    <string name="error_loading_profile_loggedin">Error loading profile! Is the username valid? Or did they block you?</string>
-    <string name="error_loading_hashtag">Error loading hashtag! Is the name valid?</string>
-    <string name="error_loading_location">Error loading location! Is the URL valid?</string>
+    <string name="error_loading_profile">加載用戶資料時出錯！請檢查輸入的用戶名是否無誤。如果無誤的話，您的 Instagram 功能可能已被暫時受限。</string>
+    <string name="error_loading_profile_loggedin">加載用戶資料時出錯！請檢查輸入的用戶名是否無誤。如果無誤的話，您可能已被對方封鎖。</string>
+    <string name="error_loading_hashtag">載入 Hashtag 時出錯。請檢查此名稱是否有誤。</string>
+    <string name="error_loading_location">載入此位置時出錯。請檢查該連結是否有誤。</string>
     <string name="error_creating_folders">建立下載資料夾時出錯！</string>
     <string name="save_to_folder">儲存到自定義資料夾</string>
     <string name="select_folder">選擇資料夾</string>
@@ -51,8 +53,10 @@
     </plurals>
     <string name="main_posts_following">%s\n追蹤中</string>
     <string name="post_viewer_autoplay_video">自動播放影片</string>
+    <string name="post_viewer_background_play">於背景繼續播放影片</string>
+    <string name="post_viewer_background_play_summary">隱藏應用程式 (如鎖屏、切換應用程式) 時，繼續播放影片</string>
     <string name="post_viewer_muted_autoplay">永遠自動靜音影片</string>
-    <string name="post_viewer_show_captions">Always show post captions</string>
+    <string name="post_viewer_show_captions">永遠顯示貼文標題</string>
     <string name="post_viewer_download_dialog_title">選擇要下載的內容</string>
     <string name="post_viewer_download_current">當前照片</string>
     <string name="post_viewer_download_album">整個相簿</string>
@@ -69,13 +73,13 @@
     <string name="answer_hint">回答…</string>
     <string name="answered_story">回答成功！</string>
     <plurals name="slider_info" comment="For slider stickers in stories, eg. 3 responses averaging 17.38%">
-        <item quantity="other">%d responses averaging %s</item>
+        <item quantity="other">%d 個回應，平均 %s</item>
     </plurals>
     <string name="slider_answer">你的答案: %s</string>
     <string name="reply_story">回覆限時動態</string>
     <string name="reply_hint">回覆…</string>
     <string name="story_quiz">測驗</string>
-    <string name="story_slider">Slider</string>
+    <string name="story_slider">滑桿</string>
     <string name="story_quizzed">您已經回答了！</string>
     <string name="story_mentions">提及</string>
     <string name="priv_acc">此帳戶為私人帳戶</string>
@@ -89,13 +93,13 @@
     <string name="remove_all_acc">刪除所有帳戶</string>
     <string name="remove_all_acc_warning">此動作將會自本程式移除所有已登入的帳號！\n如果您只想要移除單一帳號，在切換用戶按鈕上長按即可。\n你確定要繼續嗎？</string>
     <string name="time_settings">日期格式</string>
-    <string name="saved_create_collection">Create new collection</string>
-    <string name="edit_collection">Edit collection name</string>
-    <string name="delete_collection">Delete collection</string>
-    <string name="delete_collection_confirm">Are you sure you want to delete this collection?</string>
+    <string name="saved_create_collection">建立新的收藏</string>
+    <string name="edit_collection">編輯收藏名稱</string>
+    <string name="delete_collection">刪除收藏</string>
+    <string name="delete_collection_confirm">確定刪除此收藏？</string>
     <string name="delete_collection_note">All contained media will remain in other collections.</string>
-    <string name="add_to_collection">Add to collection...</string>
-    <string name="remove_from_collection">Remove from collection</string>
+    <string name="add_to_collection">新增至收藏...</string>
+    <string name="remove_from_collection">從收藏中移除</string>
     <string name="liked">已按讚</string>
     <string name="saved">已儲存</string>
     <string name="tagged">已標記</string>
@@ -111,12 +115,12 @@
     <string name="unblock">解除封鎖</string>
     <string name="restrict">限制</string>
     <string name="unrestrict">移除限制</string>
-    <string name="mute_stories">Mute stories</string>
-    <string name="mute_posts">Mute posts</string>
-    <string name="unmute_stories">Unmute stories</string>
-    <string name="unmute_posts">Unmute posts</string>
-    <string name="bio_copy">Copy bio</string>
-    <string name="bio_translate">Translate bio</string>
+    <string name="mute_stories">隱藏此用戶的限時動態</string>
+    <string name="mute_posts">隱藏此用戶的貼文</string>
+    <string name="unmute_stories">取消隱藏此用戶的限時動態</string>
+    <string name="unmute_posts">取消隱藏此用戶的貼文</string>
+    <string name="bio_copy">複製簡介</string>
+    <string name="bio_translate">翻譯簡介</string>
     <string name="status_mutual">正彼此追蹤</string>
     <string name="status_following">追蹤中</string>
     <string name="status_follower">追蹤者</string>
@@ -142,28 +146,28 @@
     <string name="open_profile">開啟個人檔案</string>
     <string name="view_story">查看限時動態</string>
     <string name="view_pfp">查看大頭貼照</string>
-    <string name="dms_inbox_raven_message_unknown">Unsupported message type</string>
+    <string name="dms_inbox_raven_message_unknown">未支援的訊息類型</string>
     <string name="dms_inbox_unsend">收回訊息</string>
-    <string name="dms_inbox_giphy">View on GIPHY</string>
+    <string name="dms_inbox_giphy">在 GIPHY 上檢視</string>
     <string name="dms_inbox_shared_post">%s shared a post by @%s</string>
-    <string name="dms_inbox_shared_image">%s shared an image</string>
-    <string name="dms_inbox_shared_video">%s shared a video</string>
-    <string name="dms_inbox_shared_message">%s sent a message</string>
-    <string name="dms_inbox_shared_gif">%s shared a gif</string>
-    <string name="dms_inbox_shared_sticker">%s shared a sticker</string>
-    <string name="dms_inbox_shared_profile">%s shared a profile: @%s</string>
-    <string name="dms_inbox_shared_location">%s shared a location: %s</string>
+    <string name="dms_inbox_shared_image">%s 分享了一張圖片</string>
+    <string name="dms_inbox_shared_video">%s 分享了一段影片</string>
+    <string name="dms_inbox_shared_message">%s 傳送了一則訊息</string>
+    <string name="dms_inbox_shared_gif">%s 分享了一個動圖</string>
+    <string name="dms_inbox_shared_sticker">%s 分享了一張貼圖</string>
+    <string name="dms_inbox_shared_profile">%s 分享了頁面: @%s</string>
+    <string name="dms_inbox_shared_location">%s 分享了位置: %s</string>
     <string name="dms_inbox_shared_highlight">%s shared a story highlight by @%s</string>
-    <string name="dms_inbox_shared_story">%s shared a story by @%s</string>
-    <string name="dms_inbox_shared_voice">%s sent a voice message</string>
+    <string name="dms_inbox_shared_story">%s 分享了 @%s 的限時動態</string>
+    <string name="dms_inbox_shared_voice">%s 傳送了一則語音訊息</string>
     <string name="dms_inbox_shared_clip">%s shared a clip by @%s</string>
-    <string name="dms_inbox_shared_igtv">%s shared an IGTV video by @%s</string>
-    <string name="dms_inbox_replied_story_outgoing">You replied to their story: %s</string>
-    <string name="dms_inbox_replied_story_incoming">%s replied to your story: %s</string>
-    <string name="dms_inbox_reacted_story_outgoing">You reacted to their story: %s</string>
-    <string name="dms_inbox_reacted_story_incoming">%s reacted to your story: %s</string>
-    <string name="dms_inbox_mentioned_story_outgoing">You mentioned @%s in your story</string>
-    <string name="dms_inbox_mentioned_story_incoming">%s mentioned you in their story</string>
+    <string name="dms_inbox_shared_igtv">%s 分享了 @%s 的 IGTV 影片</string>
+    <string name="dms_inbox_replied_story_outgoing">你回覆了對方的限時動態：%s</string>
+    <string name="dms_inbox_replied_story_incoming">%s 回覆了你的限時動態：%s</string>
+    <string name="dms_inbox_reacted_story_outgoing">你對對方的限時動態傳達了心情：%s</string>
+    <string name="dms_inbox_reacted_story_incoming">%s 對你的限時動態傳達了心情：%s</string>
+    <string name="dms_inbox_mentioned_story_outgoing">你在限時動態中提及了 @%s</string>
+    <string name="dms_inbox_mentioned_story_incoming">%s 在限時動態中提及了你</string>
     <string name="dms_inbox_raven_media_unknown"><i>未知的媒體類型</i></string>
     <string name="dms_inbox_raven_media_expired">媒體已過期！</string>
     <string name="dms_inbox_raven_media_delivered">已傳送</string>
@@ -175,17 +179,17 @@
     <string name="dms_inbox_raven_media_suggested">建議</string>
     <string name="dms_inbox_raven_media_screenshot">已截圖</string>
     <string name="dms_inbox_raven_media_cant_deliver">無法傳送</string>
-    <string name="dms_inbox_error_null_count">Unseen count response is null!</string>
-    <string name="dms_thread_message_hint">Message...</string>
-    <string name="dms_thread_audio_hint">Press and hold to record audio</string>
-    <string name="dms_thread_updating">Updating...</string>
-    <string name="dms_action_leave">Leave chat</string>
+    <string name="dms_inbox_error_null_count">未讀計數錯誤！</string>
+    <string name="dms_thread_message_hint">撰寫訊息...</string>
+    <string name="dms_thread_audio_hint">長按即可錄製語音訊息</string>
+    <string name="dms_thread_updating">更新中...</string>
+    <string name="dms_action_leave">離開聊天</string>
     <string name="dms_action_leave_question">離開此聊天室？</string>
     <string name="dms_action_kick">踢除</string>
     <string name="dms_left_users">已離開的用戶</string>
-    <string name="dms_ERROR_INVALID_USER">Invalid user</string>
-    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram does not allow uploading videos longer than 60 secs for DM.</string>
-    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram does not allow uploading audio longer than 60 secs.</string>
+    <string name="dms_ERROR_INVALID_USER">用戶無效</string>
+    <string name="dms_ERROR_VIDEO_TOO_LONG">Instagram 不允許在私訊中上傳超過 60 秒的影片。</string>
+    <string name="dms_ERROR_AUDIO_TOO_LONG">Instagram 不允許在私訊中上傳超過 60 秒的音訊。</string>
     <string name="direct_download">直接下載</string>
     <string name="direct_download_desc">將貼文直接下載到手機中！</string>
     <string name="direct_download_loading">獲取文章中</string>
@@ -198,7 +202,7 @@
     <string name="downloader_error_download_file">下載檔案時出錯</string>
     <string name="downloader_too_many">您一次只能下載100個文章。不要太貪心！</string>
     <string name="comment_viewer_copy_comment">複製評論</string>
-    <string name="comment_viewer_see_likers">View comment likers</string>
+    <string name="comment_viewer_see_likers">查看為此評論點讚的用戶</string>
     <string name="comment_viewer_reply_comment">回覆評論</string>
     <string name="comment_viewer_like_comment">對此評論說讚</string>
     <string name="comment_viewer_unlike_comment">收回評論的讚</string>
@@ -209,7 +213,7 @@
     <string name="comment_view_mention_hash_search">您要搜尋主題標籤嗎？</string>
     <string name="followers_type_followers">追蹤者</string>
     <string name="followers_type_following">追蹤中</string>
-    <string name="followers_compare">Comparing followers &amp; following</string>
+    <string name="followers_compare">比較粉絲 &amp; 關注</string>
     <string name="followers_both_following">正彼此追蹤</string>
     <string name="followers_not_following">尚未追蹤 %s</string>
     <string name="followers_not_follower">%s 尚未追蹤</string>
@@ -232,7 +236,7 @@
     <string name="crash_title">程式出錯了</string>
     <string name="crash_descr">喔噢！程式當掉了！別擔心，您可以向開發人員發送錯誤報告以協助解決此問題！ (:</string>
     <string name="action_notif">動態</string>
-    <string name="action_archive">Story archive</string>
+    <string name="action_archive">動態回憶</string>
     <string name="action_ayml">推薦用戶</string>
     <string name="select_picture">選擇圖片</string>
     <string name="uploading">上傳中…</string>
@@ -243,7 +247,7 @@
     <string name="activity_count_usertags">%d 個用戶標記</string>
     <string name="activity_count_likes">%d 個讚</string>
     <string name="activity_count_poy">%d photos of you</string>
-    <string name="activity_count_requests">%d follow requests</string>
+    <string name="activity_count_requests">%d 個追蹤請求</string>
     <string name="activity_notloggedin">你怎麼在點擊此通知前登出的？！</string>
     <string name="feed">貼文</string>
     <string name="profile">檔案</string>
@@ -278,16 +282,16 @@
     <string name="dark_theme_settings">暗色主題</string>
     <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">咖啡棕</string>
     <string name="dark_material_dark_theme">暗黑 Material</string>
-    <string name="added_to_favs">Added to Favorites!</string>
-    <string name="add_to_favorites">Add to Favorites</string>
+    <string name="added_to_favs">已收藏</string>
+    <string name="add_to_favorites">加入收藏</string>
     <string name="accounts">帳號</string>
     <string name="hashtags">主題標籤</string>
     <string name="locations">地點</string>
     <string name="unknown">未知</string>
-    <string name="removed_from_favs">Removed from Favourites!</string>
-    <string name="backup_and_restore">Backup &amp; Restore</string>
-    <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
-    <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>
+    <string name="removed_from_favs">已從收藏中移除!</string>
+    <string name="backup_and_restore">備份 &amp; 還原</string>
+    <string name="backup_summary">備份 Barinsta 的設定、登入資料、及收藏中的內容至純文字或加密後的檔案，以便日後還原。</string>
+    <string name="backup_warning">如果您選擇備份登入相關資訊，請將此檔案視為密碼看待並妥善保存！</string>
     <string name="create_backup">建立備份檔</string>
     <string name="restore_backup">以備份檔還原</string>
     <string name="file_chosen_label">檔案：</string>
@@ -296,8 +300,8 @@
     <string name="apply">套用</string>
     <string name="save">儲存</string>
     <string name="caption">說明</string>
-    <string name="edit_caption">Edit caption</string>
-    <string name="translate_caption">Translate caption</string>
+    <string name="edit_caption">編輯貼文</string>
+    <string name="translate_caption">翻譯說明</string>
     <string name="player_timeline_desc">影片播放器時間軸</string>
     <string name="liking">按讚中…</string>
     <string name="like_unsuccessful">按讚失敗</string>
@@ -309,7 +313,7 @@
     <string name="save_unsuccessful">儲存失敗</string>
     <string name="save_remove_unsuccessful">刪除失敗</string>
     <string name="downloading">下載中…</string>
-    <string name="downloader_downloading_child">Download item %1$d of %2$d</string>
+    <string name="downloader_downloading_child">下載 %1$d 中的 %2$d</string>
     <string name="delete">刪除</string>
     <string name="comment">評論</string>
     <string name="layout">佈局</string>
@@ -327,34 +331,34 @@
     <string name="show_grid_gap">網格間保留間距</string>
     <string name="disable_animation">停用動畫</string>
     <string name="follower_wait_to_load">請先等候目前的工作完成！</string>
-    <string name="follower_start_compare">Depending on user counts, this can take a while to load. Please be patient.</string>
+    <string name="follower_start_compare">根據用戶數量的不同，載入過程可能需要一段時間。請耐心等待。</string>
     <string name="post_not_found">貼文不存在！</string>
-    <string name="no_external_app_url">No app found which opens urls</string>
-    <string name="gallery">Gallery</string>
-    <string name="camera">Camera</string>
-    <string name="all_photos">All Photos</string>
-    <string name="all_media">All Media</string>
-    <string name="all_videos">All Videos</string>
-    <string name="brightness">Brightness</string>
-    <string name="contrast">Contrast</string>
-    <string name="vibrance">Vibrance</string>
-    <string name="saturation">Saturation</string>
-    <string name="sharpen">Sharpen</string>
-    <string name="exposure">Exposure</string>
-    <string name="center">Center</string>
-    <string name="color">Color</string>
-    <string name="start">Start</string>
-    <string name="end">End</string>
-    <string name="bilateral_blur">Bilateral Blur</string>
-    <string name="vignette">Vignette</string>
-    <string name="box_blur">Box blur</string>
-    <string name="sepia">Sepia</string>
+    <string name="no_external_app_url">找不到能開啟此連結的應用程式</string>
+    <string name="gallery">圖庫</string>
+    <string name="camera">相機</string>
+    <string name="all_photos">所有照片</string>
+    <string name="all_media">所有媒體</string>
+    <string name="all_videos">所有影片</string>
+    <string name="brightness">亮度</string>
+    <string name="contrast">對比度</string>
+    <string name="vibrance">鮮豔度</string>
+    <string name="saturation">飽和度</string>
+    <string name="sharpen">銳利化</string>
+    <string name="exposure">曝光度</string>
+    <string name="center">置中</string>
+    <string name="color">色彩</string>
+    <string name="start">開始</string>
+    <string name="end">結束</string>
+    <string name="bilateral_blur">雙側模糊</string>
+    <string name="vignette">漸暈</string>
+    <string name="box_blur">方框模糊</string>
+    <string name="sepia">復古</string>
     <string name="clarendon">Clarendon</string>
     <string name="one977">1977</string>
     <string name="aden">Aden</string>
-    <string name="reset">Reset</string>
-    <string name="crop">Crop</string>
-    <string name="normal">Normal</string>
+    <string name="reset">重置</string>
+    <string name="crop">裁剪</string>
+    <string name="normal">普通</string>
     <plurals name="likes_count">
         <item quantity="other">%d 個讚</item>
     </plurals>
@@ -365,90 +369,111 @@
         <item quantity="other">%d views</item>
     </plurals>
     <plurals name="stories_count">
-        <item quantity="other">%s stories</item>
+        <item quantity="other">%s 個動態</item>
     </plurals>
     <string name="download_permission">儲存空間存取權限被拒</string>
-    <string name="details">Details</string>
-    <string name="title">Title</string>
-    <string name="members">Members</string>
-    <string name="admin">Admin</string>
-    <string name="inviter">Inviter</string>
-    <string name="mute_messages">Mute messages</string>
-    <string name="mute_mentions">Mute mentions</string>
-    <string name="add_members">Add members</string>
-    <string name="search">Search</string>
-    <string name="done">Done</string>
-    <string name="dms_action_make_admin">Make Admin</string>
-    <string name="dms_action_remove_admin">Remove as Admin</string>
-    <string name="edit_unsuccessful">Edit was unsuccessful</string>
-    <string name="message">Message</string>
-    <string name="reply">Reply</string>
-    <string name="tap_to_remove">Tap to remove</string>
-    <string name="forward">Forward</string>
-    <string name="forward_outgoing">You forwarded a message</string>
-    <string name="forward_incoming">Forwarded a message</string>
-    <string name="add">Add</string>
-    <string name="send">Send</string>
-    <string name="replying_to_yourself">Replying to yourself</string>
-    <string name="replying_to_user">Replying to %s</string>
-    <string name="replied_to_yourself">You replied to yourself</string>
-    <string name="replied_you">You replied</string>
-    <string name="replied_you_group">You replied to %s</string>
-    <string name="replied_group">Replied to %s</string>
-    <string name="replied_to_you">Replied to you</string>
-    <string name="replied_to_themself">Replied to themself</string>
-    <string name="reacted_story_outgoing">You reacted to their story</string>
-    <string name="reacted_story_incoming">Reacted to your story</string>
-    <string name="mentioned_story_outgoing">You mentioned them in your story</string>
-    <string name="mentioned_story_incoming">Mentioned you in their story</string>
-    <string name="replied_story_outgoing">You replied to their story</string>
-    <string name="replied_story_incoming">Replied to your story</string>
-    <string name="raven_image_expired">Image has expired</string>
-    <string name="raven_image_info">Image will expire when seen</string>
-    <string name="raven_video_expired">Video has expired</string>
-    <string name="raven_video_info">Video will expire when seen</string>
-    <string name="raven_msg_expired">Message has expired</string>
-    <string name="raven_msg_info">Message will expire when seen</string>
-    <string name="story_share">\@%s\'s story</string>
-    <string name="story_share_highlight">\@%s\'s story highlight</string>
-    <string name="photo">Photo</string>
-    <string name="video">Video</string>
-    <string name="voice_message">Voice message</string>
-    <string name="post">Post</string>
-    <string name="approval_required_for_new_members">Approval required to join</string>
-    <string name="requests">Requests</string>
-    <string name="admins_only">Admins only</string>
-    <string name="added_by">Added by %s</string>
-    <string name="admin_approval_required">Admin approval required</string>
-    <string name="admin_approval_required_description">An admin approval will be required to add new members to the group</string>
-    <string name="dms_action_end">End chat</string>
-    <string name="dms_action_end_question">End chat?</string>
-    <string name="dms_action_end_description">All members will be removed from the group. They will still be able to view the chat history.</string>
-    <string name="pending_requests">Pending Requests</string>
-    <string name="accept_request_from_user">Accept request from %1s (%2s)?</string>
-    <string name="decline">Decline</string>
-    <string name="accept">Accept</string>
-    <string name="you">You</string>
-    <string name="no_pending_requests">No pending requests</string>
-    <string name="checking_for_new_messages">Checking for new messages</string>
-    <string name="pref_category_stories">Stories</string>
-    <string name="pref_category_dm">DM</string>
-    <string name="pref_category_notifications">Notifications</string>
-    <string name="pref_category_post">Post</string>
-    <string name="enable_dm_notifications">Enable DM notifications</string>
-    <string name="enable_dm_auto_refesh">Auto refresh messages</string>
-    <string name="auto_refresh_every">Auto refresh every</string>
-    <string name="secs">secs</string>
-    <string name="mins">mins</string>
-    <string name="search_giphy">Search GIPHY</string>
-    <string name="generic_null_response">Response is null!</string>
-    <string name="generic_not_ok_response">Response status is not ok!</string>
-    <string name="generic_failed_request">Request failed!</string>
-    <string name="hint_keyword">Keyword</string>
-    <string name="toggle_keyword_filter">Enable keyword filter</string>
-    <string name="edit_keyword_filter">Edit keyword filters</string>
-    <string name="added_keywords">Added keyword: %s to filter list</string>
-    <string name="removed_keywords">Removed keyword: %s from filter list</string>
-    <string name="marked_as_seen">Marked as seen</string>
-    <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="details">詳情</string>
+    <string name="title">標題</string>
+    <string name="members">成員</string>
+    <string name="admin">管理員</string>
+    <string name="inviter">邀請人</string>
+    <string name="mute_messages">將訊息靜音</string>
+    <string name="mute_mentions">將提及靜音</string>
+    <string name="add_members">新增成員</string>
+    <string name="search">搜尋</string>
+    <string name="done">完成</string>
+    <string name="dms_action_make_admin">設為管理員</string>
+    <string name="dms_action_remove_admin">移除管理員權限</string>
+    <string name="edit_unsuccessful">編輯失敗</string>
+    <string name="message">訊息</string>
+    <string name="reply">回覆</string>
+    <string name="tap_to_remove">點擊即可刪除</string>
+    <string name="forward">轉發</string>
+    <string name="forward_outgoing">您轉發了一條訊息</string>
+    <string name="forward_incoming">轉發了一條訊息</string>
+    <string name="add">新增</string>
+    <string name="send">發送</string>
+    <string name="replying_to_yourself">回覆給自己</string>
+    <string name="replying_to_user">回覆 %s</string>
+    <string name="replied_to_yourself">您回覆了自己</string>
+    <string name="replied_you">您回覆了</string>
+    <string name="replied_you_group">你回覆了 %s 的限時動態</string>
+    <string name="replied_group">回覆了 %s 的限時動態</string>
+    <string name="replied_to_you">回覆給您</string>
+    <string name="replied_to_themself">回覆給他自己</string>
+    <string name="reacted_story_outgoing">你對對方的限時動態傳達了心情</string>
+    <string name="reacted_story_incoming">對你的限時動態傳達了心情</string>
+    <string name="mentioned_story_outgoing">你在限時動態中提及了他</string>
+    <string name="mentioned_story_incoming">他在限時動態中提及了你</string>
+    <string name="replied_story_outgoing">你回覆了對方的限時動態</string>
+    <string name="replied_story_incoming">回覆了你的限時動態</string>
+    <string name="raven_image_expired">圖片已過期</string>
+    <string name="raven_image_info">圖片會在開啟後過期</string>
+    <string name="raven_video_expired">影片已過期</string>
+    <string name="raven_video_info">影片會在開啟後過期</string>
+    <string name="raven_msg_expired">訊息已過期</string>
+    <string name="raven_msg_info">訊息會在開啟後過期</string>
+    <string name="story_share">\@%s 的限時動態</string>
+    <string name="story_share_highlight">\@%s 的精選限時動態</string>
+    <string name="photo">照片</string>
+    <string name="video">影片</string>
+    <string name="voice_message">語音訊息</string>
+    <string name="post">貼文</string>
+    <string name="approval_required_for_new_members">需批准才能加入</string>
+    <string name="requests">請求</string>
+    <string name="admins_only">限管理員可用</string>
+    <string name="added_by">由 %s 加入</string>
+    <string name="admin_approval_required">需要管理員批准</string>
+    <string name="admin_approval_required_description">添加新成員至此群組需管理員批准</string>
+    <string name="dms_action_end">結束聊天</string>
+    <string name="dms_action_end_question">結束聊天?</string>
+    <string name="dms_action_end_description">將踢出群組中的所有成員。他們仍然可以查看聊天記錄。</string>
+    <string name="pending_requests">待處理的請求</string>
+    <string name="accept_request_from_user">接受來自 %1s (%2s) 的請求？</string>
+    <string name="decline">拒絕</string>
+    <string name="accept">接受</string>
+    <string name="you">您</string>
+    <string name="no_pending_requests">無待處理的請求</string>
+    <string name="checking_for_new_messages">正在檢查新訊息</string>
+    <string name="pref_category_stories">限時動態</string>
+    <string name="pref_category_dm">私訊</string>
+    <string name="pref_category_notifications">通知</string>
+    <string name="pref_category_post">文章</string>
+    <string name="enable_dm_notifications">啟用私訊通知</string>
+    <string name="enable_dm_auto_refesh">自動刷新私訊</string>
+    <string name="auto_refresh_every">自動刷新間隔</string>
+    <string name="secs">秒</string>
+    <string name="mins">分</string>
+    <string name="search_giphy">搜尋 GIPHY</string>
+    <string name="generic_null_response">回應為空！</string>
+    <string name="generic_not_ok_response">回應狀態錯誤！</string>
+    <string name="generic_failed_request">請求失敗！</string>
+    <string name="hint_keyword">關鍵字</string>
+    <string name="toggle_keyword_filter">啟用關鍵字過濾</string>
+    <string name="edit_keyword_filter">編輯關鍵字過濾</string>
+    <string name="added_keywords">已新增關鍵字：%s 至過濾列表</string>
+    <string name="removed_keywords">已從過濾列表移除關鍵字：%s</string>
+    <string name="marked_as_seen">標記為已讀</string>
+    <string name="delete_unsuccessful">刪除失敗</string>
+    <string name="throttle_error">您發送的 API 請求過多。請稍後再試。</string>
+    <string name="error">錯誤</string>
+    <string name="account_logged_out">此帳戶已被登出。</string>
+    <string name="login_required">需要登入！</string>
+    <string name="sentry_block">Sentry 故障。</string>
+    <string name="inactive_user">此用戶已被停用！</string>
+    <string name="crash_report_subject">Barinsta 錯誤報告</string>
+    <string name="crash_report_title">選擇任一電子郵件應用程式回傳錯誤報告</string>
+    <string name="not_found">未找到所要的內容！</string>
+    <string name="rate_limit">您的 IP 位置已被 Instagram 設限。請稍待一個小時後再試。</string>
+    <string name="skip_update">跳過此更新</string>
+    <string name="on_latest_version">已經是最新版本</string>
+    <string name="tab_order">頁面順序</string>
+    <string name="other_tabs">其他頁面</string>
+    <string name="tab_order_start_next_launch">頁面順序將在下次啟動時生效</string>
+    <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
+    <string name="copy_caption">Copy caption</string>
+    <string name="copy_reply">複製回覆</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 18f963e7..1fdfb375 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
             <enum name="small" value="1" />
             <enum name="regular" value="2" />
             <enum name="large" value="3" />
+            <enum name="smaller" value="4" />
         </attr>
     </declare-styleable>
     <declare-styleable name="ChatMessageLayout">
@@ -20,6 +21,10 @@
     <attr name="dmWaveformProgressColor" format="reference" />
     <attr name="dmInputTextColor" format="reference" />
 
+    <attr name="toolbarColor" format="reference" />
+    <attr name="searchInputStyle" format="reference" />
+    <attr name="parentCommentHighlightColor" format="reference" />
+
     <declare-styleable name="RecordView">
         <attr name="slide_to_cancel_text" format="string" />
         <attr name="slide_to_cancel_text_color" format="reference" />
@@ -34,4 +39,9 @@
         <attr name="waveformBackgroundColor" format="reference" />
         <attr name="waveformProgressColor" format="reference" />
     </declare-styleable>
+
+    <declare-styleable name="TextViewDrawableSize">
+        <attr name="compoundDrawableWidth" format="dimension" />
+        <attr name="compoundDrawableHeight" format="dimension" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index fd773071..a4ea3e6f 100755
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -25,8 +25,9 @@
 
     <color name="dm_profile_button_color">#efefef</color>
 
-    <color name="comment_selected">#888888</color>
-    <color name="comment_liked">#40FF69B4</color>
+    <color name="parent_comment_dark_materialdark">#FF082654</color>
+    <color name="parent_comment_light_white">@color/grey_300</color>
+    <!--<color name="comment_liked">#40FF69B4</color>-->
 
     <color name="white">#FFFFFF</color>
     <color name="white_a50">#80FFFFFF</color>
@@ -63,6 +64,10 @@
     <color name="blue_A400">#2979FF</color>
     <color name="blue_A700">#2962FF</color>
 
+    <color name="light_blue_900">#01579b</color>
+
+    <color name="indigo_900">#1A237E</color>
+
     <color name="brown_50">#EFEBE9</color>
     <color name="brown_100">#D7CCC8</color>
     <color name="brown_200">#BCAAA4</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fe527b2d..2e12b35d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,6 +9,7 @@
     <dimen name="image_size_40">40dp</dimen>
 
     <dimen name="profile_pic_size_tiny">24dp</dimen>
+    <dimen name="profile_pic_size_smaller">32dp</dimen>
     <dimen name="profile_pic_size_small">40dp</dimen>
     <dimen name="profile_pic_size_regular">48dp</dimen>
     <dimen name="profile_pic_size_large">90dp</dimen>
diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml
new file mode 100644
index 00000000..0c0d1933
--- /dev/null
+++ b/app/src/main/res/values/drawables.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--<drawable name="exo_styled_controls_play">@drawable/ic_play_arrow_24</drawable>-->
+    <!--<drawable name="exo_styled_controls_pause">@drawable/ic_pause_24</drawable>-->
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ac325b4a..36fa5042 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
     <string name="update_check">Check for updates at startup</string>
     <string name="flag_secure">Block screenshots &amp; app preview</string>
     <string name="download_user_folder">Download posts to username folders</string>
+    <string name="download_prepend_username">Prepend Username to Filename</string>
     <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
     <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
     <string name="hide_muted_reels_setting">Hide muted stories from feed</string>
@@ -58,6 +59,8 @@
     </plurals>
     <string name="main_posts_following">%s\nFollowing</string>
     <string name="post_viewer_autoplay_video">Autoplay videos</string>
+    <string name="post_viewer_background_play">Continue videos in background</string>
+    <string name="post_viewer_background_play_summary">Do not pause videos when the app is out of focus</string>
     <string name="post_viewer_muted_autoplay">Always mute videos</string>
     <string name="post_viewer_show_captions">Always show post captions</string>
     <string name="post_viewer_download_dialog_title">Select what to download</string>
@@ -378,6 +381,10 @@
         <item quantity="one">%d like</item>
         <item quantity="other">%d likes</item>
     </plurals>
+    <plurals name="replies_count">
+        <item quantity="one">%d reply</item>
+        <item quantity="other">%d replies</item>
+    </plurals>
     <plurals name="comments_count">
         <item quantity="one">%d comment</item>
         <item quantity="other">%d comments</item>
@@ -474,8 +481,16 @@
     <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
+    <string name="throttle_error">Throttled by Instagram because of too many API requests. Wait for some time before retrying.</string>
+    <string name="error">Error</string>
+    <string name="account_logged_out">This account has been logged out.</string>
+    <string name="login_required">Login required!</string>
+    <string name="sentry_block">Sentry block.</string>
+    <string name="inactive_user">User is inactive!</string>
     <string name="crash_report_subject">Barinsta Crash Report</string>
     <string name="crash_report_title">Select an email app to send crash logs</string>
+    <string name="not_found">Not found!</string>
+    <string name="rate_limit">Your IP has been rate limited by Instagram. Wait for an hour and try again.</string>
     <string name="skip_update">Skip this update</string>
     <string name="on_latest_version">You\'re already on the latest version</string>
     <string name="tab_order">Screen order</string>
@@ -484,4 +499,9 @@
     <string name="dm_remove_warning">If saved, all DM related features will be disabled on next launch</string>
     <string name="copy_caption">Copy caption</string>
     <string name="copy_reply">Copy reply</string>
+    <string name="top">Top</string>
+    <string name="recent">Recent</string>
+    <string name="clear">Clear</string>
+    <string name="no_external_map_app">No Map app found!</string>
+    <string name="click_to_show_full">Click to view full count</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f31e985d..3c212ab7 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -225,4 +225,49 @@
         <item name="android:paddingEnd">0dp</item>
         <item name="iconPadding">0dp</item>
     </style>
+
+    <style name="TextAppearance.Design.Tab.RegularCaps" parent="TextAppearance.Design.Tab">
+        <item name="textAllCaps">false</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.TabLayout.RegularCaps" parent="Widget.MaterialComponents.TabLayout">
+        <item name="tabTextAppearance">@style/TextAppearance.Design.Tab.RegularCaps</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.TabLayout.Light.White" parent="Widget.MaterialComponents.TabLayout">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.TabLayout.Light.White</item>
+    </style>
+
+    <style name="ThemeOverlay.App.TabLayout.Light.White" parent="">
+        <item name="colorPrimary">@color/black</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.TabLayout.Dark.Black" parent="Widget.MaterialComponents.TabLayout">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.TabLayout.Dark.Black</item>
+    </style>
+
+    <style name="ThemeOverlay.App.TabLayout.Dark.Black" parent="">
+        <item name="colorPrimary">@color/white</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Light.Barinsta</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorOnSurface">@color/black</item>
+    </style>
+
+    <style name="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Light.Barinsta" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
+        <item name="colorPrimary">@color/white</item>
+    </style>
+
+    <style name="Widget.MaterialComponents.TextInputLayout.FilledBox.Dark.Black" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dark.Black</item>
+        <item name="hintTextColor">@color/white</item>
+        <item name="boxStrokeColor">@color/white</item>
+    </style>
+
+    <style name="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox.Dark.Black" parent="ThemeOverlay.MaterialComponents.TextInputEditText.FilledBox">
+        <item name="colorPrimary">@color/white</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a0e7a3b8..660a2189 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -23,6 +23,7 @@
         <item name="dmIncomingBgColor">@color/grey_600</item>
         <item name="dmOutgoingBgColor">@color/deep_purple_400</item>
         <item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
+        <item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
     </style>
 
     <style name="AppTheme.Light.White" parent="AppTheme.Light">
@@ -33,8 +34,11 @@
         <item name="colorSecondaryVariant">@color/white</item>
         <item name="colorOnSecondary">@color/black</item>
         <item name="colorSurface">@color/white</item>
+        <item name="toolbarColor">?colorSurface</item>
         <item name="colorOnSurface">@color/black</item>
         <item name="colorAccent">@color/black</item>
+        <item name="colorControlActivated">@color/black</item>
+        <item name="android:colorControlActivated">@color/black</item>
         <item name="editTextColor">@color/black</item>
         <item name="android:editTextColor">@color/black</item>
         <item name="android:textColorPrimary">@color/black</item>
@@ -48,6 +52,8 @@
         <item name="dmWaveformBgColor">@color/grey_600</item>
         <item name="dmWaveformProgressColor">@color/blue_800</item>
         <item name="dmInputTextColor">@color/black</item>
+        <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Light.White</item>
+        <item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
     </style>
 
     <style name="AppTheme.Light.Barinsta" parent="AppTheme.Light">
@@ -57,6 +63,7 @@
         <item name="colorSecondary">@color/barinstaColorSecondary</item>
         <item name="colorSecondaryVariant">@color/barinstaColorSecondaryDark</item>
         <item name="colorSurface">@color/grey_200</item>
+        <item name="toolbarColor">?colorPrimary</item>
         <item name="colorControlHighlight">@color/barinstaColorSecondaryDark</item>
         <item name="colorAccent">@color/barinstaColorSecondaryDark</item>
         <!--<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.ActionBar</item>-->
@@ -65,6 +72,8 @@
         <item name="android:textColorPrimary">@color/barinstaPrimaryTextColor</item>
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
         <item name="dmInputTextColor">@color/black</item>
+        <item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta</item>
+        <item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
     </style>
 
     <style name="AppTheme.Light.Bibliogram" parent="AppTheme.Light">
@@ -74,6 +83,7 @@
         <item name="colorSecondary">@color/bibliogramColorSecondary</item>
         <item name="colorSecondaryVariant">@color/bibliogramColorSecondaryDark</item>
         <item name="colorSurface">@color/grey_200</item>
+        <item name="toolbarColor">?colorPrimary</item>
         <item name="colorControlHighlight">@color/bibliogramColorSecondaryDark</item>
         <item name="colorAccent">@color/bibliogramColorSecondaryDark</item>
         <item name="android:windowBackground">?colorSurface</item>
@@ -81,6 +91,8 @@
         <item name="android:textColorPrimary">@color/bibliogramPrimaryTextColor</item>
         <item name="toolbarStyle">@style/Widget.MaterialComponents.Toolbar.Light.Barinsta</item>
         <item name="dmInputTextColor">@color/black</item>
+        <item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Light.Barinsta</item>
+        <item name="parentCommentHighlightColor">@color/parent_comment_light_white</item>
     </style>
 
 
@@ -103,6 +115,7 @@
         <item name="dmWaveformBgColor">@color/white</item>
         <item name="dmWaveformProgressColor">@color/blue_800</item>
         <item name="dmInputTextColor">@color/white</item>
+        <item name="searchInputStyle">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox</item>
     </style>
 
     <style name="AppTheme.Dark.Black" parent="AppTheme.Dark">
@@ -114,9 +127,12 @@
         <item name="colorOnSecondary">@color/white</item>
         <item name="colorSecondaryVariant">@color/black</item>
         <item name="colorSurface">@color/black</item>
+        <item name="toolbarColor">?colorSurface</item>
         <item name="colorOnSurface">@color/white</item>
         <item name="colorAccent">@color/blue_A700</item>
         <item name="colorControlHighlight">@color/grey_600</item>
+        <item name="colorControlActivated">@color/white</item>
+        <item name="android:colorControlActivated">@color/white</item>
         <item name="android:textColorPrimary">@color/white</item>
         <item name="android:textColorSecondary">@color/white</item>
         <item name="android:textColorHint">@color/grey_500</item>
@@ -126,12 +142,15 @@
         <item name="android:dialogTheme">@style/Widget.Dialog.Dark.Black</item>
         <item name="alertDialogTheme">@style/Widget.AlertDialog.Dark.Black</item>
         <item name="switchStyle">@style/Widget.AppCompat.CompoundButton.Switch.Dark.Black</item>
-        <item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown.Dark.Black</item>
+        <!--<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown.Dark.Black</item>-->
         <item name="preferenceFragmentCompatStyle">@style/PreferenceFragmentCompatStyle.Dark.Black</item>
         <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Primary</item>
         <item name="dmIncomingBgColor">@color/grey_600</item>
         <item name="dmOutgoingBgColor">@color/deep_purple_400</item>
         <item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
+        <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout.Dark.Black</item>
+        <item name="textInputStyle">@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dark.Black</item>
+        <item name="parentCommentHighlightColor">@color/parent_comment_dark_materialdark</item>
     </style>
 
     <style name="AppTheme.Dark.MaterialDark" parent="AppTheme.Dark">
@@ -142,6 +161,7 @@
         <item name="android:windowBackground">@color/grey_900</item>
         <item name="android:colorBackground">@color/grey_900</item>
         <item name="colorSurface">@color/grey_900</item>
+        <item name="toolbarColor">?colorSurface</item>
         <item name="colorError">@color/red_200</item>
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorOnSecondary">@color/black</item>
@@ -153,6 +173,7 @@
         <item name="dmIncomingBgColor">@color/grey_600</item>
         <item name="dmOutgoingBgColor">@color/deep_purple_400</item>
         <item name="dmDateHeaderBgColor">@color/deep_purple_600</item>
+        <item name="parentCommentHighlightColor">@color/parent_comment_dark_materialdark</item>
     </style>
 
     <style name="AppTheme.Launcher" parent="AppTheme.Dark">
diff --git a/app/src/main/res/xml/header_list_scene.xml b/app/src/main/res/xml/header_list_scene.xml
new file mode 100644
index 00000000..389b7cb1
--- /dev/null
+++ b/app/src/main/res/xml/header_list_scene.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto">
+    <ConstraintSet android:id="@+id/start">
+        <Constraint
+            android:id="@+id/header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toTopOf="parent" />
+    </ConstraintSet>
+    <ConstraintSet android:id="@+id/end">
+        <Constraint
+            android:id="@+id/header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            motion:layout_constraintBottom_toTopOf="parent"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent" />
+    </ConstraintSet>
+    <Transition
+        android:id="@+id/transition"
+        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetStart="@+id/start">
+        <OnSwipe
+            motion:dragDirection="dragUp"
+            motion:onTouchUp="stop"
+            motion:touchAnchorId="@+id/header"
+            motion:touchAnchorSide="bottom" />
+    </Transition>
+</MotionScene>
\ No newline at end of file
diff --git a/app/src/main/resources/feed_response.json b/app/src/main/resources/feed_response.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/app/src/main/resources/feed_response.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/app/src/main/resources/stories_response.json b/app/src/main/resources/stories_response.json
deleted file mode 100644
index 9e26dfee..00000000
--- a/app/src/main/resources/stories_response.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b2578fbd..cf769fff 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        def nav_version = "2.3.4"
+        classpath 'com.android.tools.build:gradle:4.2.0'
+        def nav_version = "2.3.5"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
     }
 }
@@ -14,7 +14,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/61.txt b/fastlane/metadata/android/en-US/changelogs/61.txt
new file mode 100644
index 00000000..327c4802
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/61.txt
@@ -0,0 +1,3 @@
+New customizable bottom navigation bar, keyword filter, add username to file name, FLAG_SECURE, and more!
+
+For details see https://github.com/austinhuang0131/barinsta/releases/tag/v19.2.0
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/62.txt b/fastlane/metadata/android/en-US/changelogs/62.txt
new file mode 100644
index 00000000..f227ef0f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/62.txt
@@ -0,0 +1,3 @@
+Option to play video in background, favorites tab for anonymous users, and bug fixes.
+
+For details see https://github.com/austinhuang0131/barinsta/releases/tag/v19.2.1
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 199d16ed..8f97ac54 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,16 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
+#Tue May 04 02:33:38 JST 2021
 android.enableJetifier=true
-
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx1536M"