diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
index 68453d91..449e7e7f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/StyledToolbarNavigationController.java
@@ -75,14 +75,10 @@ public class StyledToolbarNavigationController extends ToolbarNavigationControll
     }
 
     @Override
-    public void onMenuOrBackClicked(boolean isArrow) {
-        if (isArrow) {
-            onBack();
-        } else {
-            DrawerController drawerController = getDrawerController();
-            if (drawerController != null) {
-                drawerController.onMenuClicked();
-            }
+    public void onMenuClicked() {
+        DrawerController drawerController = getDrawerController();
+        if (drawerController != null) {
+            drawerController.onMenuClicked();
         }
     }
 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
index 7035ad2f..3783ee11 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ToolbarNavigationController.java
@@ -53,6 +53,14 @@ public abstract class ToolbarNavigationController extends NavigationController i
 
     @Override
     public void onMenuOrBackClicked(boolean isArrow) {
+        if (isArrow) {
+            onBack();
+        } else {
+            onMenuClicked();
+        }
+    }
+
+    public void onMenuClicked() {
     }
 
     @Override
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
index 319e6630..b2a69d08 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadListLayout.java
@@ -18,7 +18,6 @@
 package org.floens.chan.ui.layout;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -44,7 +43,6 @@ import org.floens.chan.ui.toolbar.Toolbar;
 import org.floens.chan.ui.view.ThumbnailView;
 import org.floens.chan.utils.AndroidUtils;
 import org.floens.chan.utils.AnimationUtils;
-import org.floens.chan.utils.Logger;
 
 import java.util.List;