diff --git a/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
index 36ec47819..307f68001 100644
--- a/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/apps/AppsContainerFragment.kt
@@ -70,10 +70,10 @@ class AppsContainerFragment : Fragment() {
 
         TabLayoutMediator(B.tabLayout, B.pager, true) { tab: TabLayout.Tab, position: Int ->
             when (position) {
-                0 -> tab.text = "For you"
-                1 -> tab.text = "Top charts"
-                2 -> tab.text = "Categories"
-                3 -> tab.text = "Editor's choice"
+                0 -> tab.text = getString(R.string.tab_for_you)
+                1 -> tab.text = getString(R.string.tab_top_charts)
+                2 -> tab.text = getString(R.string.tab_categories)
+                3 -> tab.text = getString(R.string.tab_editor_choice)
                 else -> {
                 }
             }
diff --git a/app/src/main/res/layout-v21/view_dev_info.xml b/app/src/main/res/layout-v21/view_dev_info.xml
index 88e0401b1..0a389eaba 100644
--- a/app/src/main/res/layout-v21/view_dev_info.xml
+++ b/app/src/main/res/layout-v21/view_dev_info.xml
@@ -51,7 +51,7 @@
         android:layout_below="@id/txt_title"
         android:layout_alignStart="@id/txt_title"
         android:layout_alignEnd="@id/txt_title"
-        android:autoLink="map"
+        android:autoLink="all"
         android:linksClickable="true"
         android:textAppearance="@style/TextAppearance.Aurora.Line2"
         android:textColorLink="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 318c01caa..bdc69e4a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -266,6 +266,10 @@
 
     <string name="spoof_apply">"Make sure you re-login to apply the spoof"</string>
 
+    <string name="tab_categories">"Categories"</string>
+    <string name="tab_editor_choice">"Editor's choice"</string>
+    <string name="tab_for_you">"For you"</string>
+    <string name="tab_top_charts">"Top charts"</string>
     <string name="tab_top_free">"Top free"</string>
     <string name="tab_top_grossing">"Top grossing"</string>
     <string name="tab_top_paid">"Top paid"</string>