diff --git a/app/src/main/java/com/dragons/custom/CustomAppBar.java b/app/src/main/java/com/dragons/custom/CustomAppBar.java
index 8f2d20baf..0c0730ccc 100644
--- a/app/src/main/java/com/dragons/custom/CustomAppBar.java
+++ b/app/src/main/java/com/dragons/custom/CustomAppBar.java
@@ -26,6 +26,7 @@ import android.support.annotation.MenuRes;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.v4.widget.NestedScrollView;
+import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
@@ -38,10 +39,9 @@ import com.dragons.aurora.R;
 public class CustomAppBar extends NestedScrollView {
 
     public static final String MORE_ICON_TAG = "more_icon_tag";
-
+    private static final int sColumnWidth = 60;
     private BottomSheetBehavior bottomSheetBehavior;
     private ImageView showLessMore;
-
     private OnClickListener onMoreClickListener = new OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -53,7 +53,6 @@ public class CustomAppBar extends NestedScrollView {
             }
         }
     };
-
     private BottomSheetBehavior.BottomSheetCallback bottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback() {
         @Override
         public void onStateChanged(@NonNull View bottomSheet, int newState) {
@@ -106,7 +105,6 @@ public class CustomAppBar extends NestedScrollView {
     public void setSecondaryMenu(@MenuRes int menuRes, OnClickListener onClickListener) {
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.secondary_menu_items_recyler);
         recyclerView.setNestedScrollingEnabled(false);
-        recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
         MenuSecondaryItemsAdapter menuSecondaryItemsAdapter = new MenuSecondaryItemsAdapter(getContext(), menuRes, onClickListener);
         recyclerView.setAdapter(menuSecondaryItemsAdapter);
     }
@@ -127,6 +125,5 @@ public class CustomAppBar extends NestedScrollView {
     public void expand() {
         bottomSheetBehavior.setState(BottomSheetBehavior.PEEK_HEIGHT_AUTO);
     }
-
 }
 
diff --git a/app/src/main/res/layout/content_app_bar.xml b/app/src/main/res/layout/content_app_bar.xml
index 3efca5e58..32505cbd7 100644
--- a/app/src/main/res/layout/content_app_bar.xml
+++ b/app/src/main/res/layout/content_app_bar.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Aurora Store
   ~ Copyright (C) 2018  Rahul Kumar Patel <whyorean@gmail.com>
   ~
@@ -52,8 +51,8 @@
                 android:id="@+id/nav_items_recycler"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
+                android:layout_marginStart="4dp"
                 android:gravity="fill_horizontal"
                 android:orientation="horizontal"
                 app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
@@ -61,22 +60,24 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height=".8dp"
+                android:layout_marginEnd="25dp"
                 android:layout_marginStart="25dp"
                 android:layout_marginTop="5dp"
-                android:layout_marginEnd="25dp"
                 android:background="@drawable/list_divider" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/secondary_menu_items_recyler"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="15dp"
                 android:layout_marginBottom="10dp"
-                android:orientation="horizontal"
-                android:paddingStart="8dp"
+                android:layout_marginEnd="15dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginTop="15dp"
+                android:orientation="vertical"
                 android:paddingEnd="8dp"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+                android:paddingStart="8dp"
+                app:layoutManager="android.support.v7.widget.GridLayoutManager"
+                app:spanCount="2" />
         </LinearLayout>
     </com.github.florent37.shapeofview.shapes.RoundRectView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_spoof.xml b/app/src/main/res/layout/fragment_spoof.xml
index bec2f5535..c99414001 100644
--- a/app/src/main/res/layout/fragment_spoof.xml
+++ b/app/src/main/res/layout/fragment_spoof.xml
@@ -139,6 +139,7 @@
                         android:layout_marginTop="10dp"
                         android:layout_toEndOf="@+id/device_avatar"
                         android:ellipsize="end"
+                        android:textAlignment="viewStart"
                         android:fontFamily="@font/google_sans_bold"
                         android:singleLine="true"
                         android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/menu_item.xml b/app/src/main/res/layout/menu_item.xml
index 09a1495fa..d5e72cfc7 100644
--- a/app/src/main/res/layout/menu_item.xml
+++ b/app/src/main/res/layout/menu_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Aurora Store
   ~ Copyright (C) 2018  Rahul Kumar Patel <whyorean@gmail.com>
   ~
@@ -21,7 +20,7 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="4dp"
     android:background="@drawable/button_bg"
@@ -37,19 +36,16 @@
         android:alpha=".8"
         android:scaleX=".8"
         android:scaleY=".8"
-        android:tint="?android:attr/colorForeground"
-        android:src="@drawable/ic_categories" />
+        android:tint="?android:attr/colorForeground" />
 
     <TextView
         android:id="@+id/menu_item_label"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
+        android:layout_centerInParent="true"
         android:layout_toEndOf="@+id/menu_item_icon"
         android:fontFamily="@font/google_sans_bold"
-        android:text="@string/action_filter_rating"
+        android:textAlignment="center"
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="@dimen/appbar_secondary_menu_text_size" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3adf4f0a3..20918e2b2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,7 +33,7 @@
 
     <!-- Appbar dimensions -->
     <dimen name="appbar_bar_height">86dp</dimen>
-    <dimen name="appbar_bar_height_margin">48dp</dimen>
+    <dimen name="appbar_bar_height_margin">50dp</dimen>
     <dimen name="appbar_bar_elevation">10dp</dimen>
 
     <dimen name="appbar_icon_padding">15dp</dimen>