diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java
index b0c0f310..d3a86d17 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BoardEditController.java
@@ -20,6 +20,8 @@ package org.floens.chan.ui.controller;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -43,9 +45,6 @@ import org.floens.chan.core.manager.BoardManager;
 import org.floens.chan.core.model.Board;
 import org.floens.chan.ui.drawable.ThumbDrawable;
 import org.floens.chan.ui.helper.SwipeListener;
-import org.floens.chan.ui.toolbar.ToolbarMenu;
-import org.floens.chan.ui.toolbar.ToolbarMenuItem;
-import org.floens.chan.ui.view.FloatingMenuItem;
 import org.floens.chan.utils.AndroidUtils;
 
 import java.util.ArrayList;
@@ -54,13 +53,13 @@ import java.util.Locale;
 
 import static org.floens.chan.utils.AndroidUtils.dp;
 
-public class BoardEditController extends Controller implements SwipeListener.Callback, ToolbarMenuItem.ToolbarMenuItemCallback {
-    private static final int ADD_ID = 1;
+public class BoardEditController extends Controller implements SwipeListener.Callback, View.OnClickListener {
 
     private final BoardManager boardManager = Chan.getBoardManager();
 
     private RecyclerView recyclerView;
     private BoardEditAdapter adapter;
+    private FloatingActionButton done;
 
     private List<Board> boards;
 
@@ -73,11 +72,11 @@ public class BoardEditController extends Controller implements SwipeListener.Cal
         super.onCreate();
 
         navigationItem.title = string(R.string.board_edit);
-        navigationItem.menu = new ToolbarMenu(context);
-        navigationItem.menu.addItem(new ToolbarMenuItem(context, this, ADD_ID, R.drawable.ic_add_white_24dp));
         view = inflateRes(R.layout.controller_board_edit);
         recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
         recyclerView.setHasFixedSize(true);
+        done = (FloatingActionButton) view.findViewById(R.id.done);
+        done.setOnClickListener(this);
 
         boards = boardManager.getSavedBoards();
 
@@ -99,17 +98,12 @@ public class BoardEditController extends Controller implements SwipeListener.Cal
     }
 
     @Override
-    public void onMenuItemClicked(ToolbarMenuItem item) {
-        if ((Integer) item.getId() == ADD_ID) {
+    public void onClick(View v) {
+        if (v == done) {
             showAddBoardDialog();
         }
     }
 
-    @Override
-    public void onSubMenuItemClicked(ToolbarMenuItem parent, FloatingMenuItem item) {
-
-    }
-
     @Override
     public SwipeListener.Swipeable getSwipeable(int position) {
         return (position > 0 && boards.size() > 1) ? SwipeListener.Swipeable.BOTH : SwipeListener.Swipeable.NO;
@@ -197,7 +191,7 @@ public class BoardEditController extends Controller implements SwipeListener.Cal
                 boards.add(board);
                 adapter.notifyDataSetChanged();
 
-                new AlertDialog.Builder(context).setMessage(string(R.string.board_add_success) + " " + board.key).setPositiveButton(R.string.ok, null).show();
+                Snackbar.make(view, string(R.string.board_add_success) + " " + board.key, Snackbar.LENGTH_LONG).show();
 
                 return;
             }
diff --git a/Clover/app/src/main/res/layout/controller_board_edit.xml b/Clover/app/src/main/res/layout/controller_board_edit.xml
index 0cf9020b..9876f206 100644
--- a/Clover/app/src/main/res/layout/controller_board_edit.xml
+++ b/Clover/app/src/main/res/layout/controller_board_edit.xml
@@ -15,11 +15,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?backcolor"
-    android:orientation="vertical">
+    android:background="?backcolor">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view"
@@ -30,4 +29,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical" />
 
-</LinearLayout>
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/done"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|bottom"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_done_white_24dp" />
+
+</android.support.design.widget.CoordinatorLayout>