diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index fab3a894beb732442782bc6780e669035dd225fc..a7a83efbdb2f829c708928930af672b910dc4bd2 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -1,7 +1,6 @@
 package de.kuschku.quasseldroid.ui.chat.buffers
 
 import android.arch.lifecycle.Observer
-import android.os.Build
 import android.os.Bundle
 import android.support.v7.widget.*
 import android.view.*
@@ -147,10 +146,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
     }
 
     override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-      mode?.tag = "MESSAGES"
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        mode?.type = ActionMode.TYPE_FLOATING
-      }
+      mode?.tag = "BUFFERS"
       return true
     }
 
@@ -216,8 +212,8 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
       viewModel.collapsedNetworks,
       ::runInBackground,
       activity!!::runOnUiThread,
-      clickListener,
-      longClickListener
+      ::clickListener,
+      ::longClickListener
     )
     chatList.adapter = listAdapter
 
@@ -320,15 +316,15 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
     outState.putParcelable(KEY_STATE_SPINNER, chatListSpinner.onSaveInstanceState())
   }
 
-  private val clickListener: ((BufferId) -> Unit)? = {
+  private fun clickListener(it: BufferId) {
     if (actionMode != null) {
-      longClickListener?.invoke(it)
+      longClickListener(it)
     } else {
       viewModel.buffer.onNext(it)
     }
   }
 
-  private val longClickListener: ((BufferId) -> Unit)? = {
+  private fun longClickListener(it: BufferId) {
     if (actionMode == null) {
       chatListToolbar.startActionMode(actionModeCallback)
     }
diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml
index a1d1ba3f46f4dda7fe5360f96696d909797f8663..b879bc0ca25c57547b3f870a5794c91901a0cda5 100644
--- a/app/src/main/res/layout-sw720dp/activity_settings.xml
+++ b/app/src/main/res/layout-sw720dp/activity_settings.xml
@@ -29,7 +29,7 @@
 
     <android.support.v7.widget.CardView
       android:layout_width="@dimen/max_content_width"
-      android:layout_height="match_parent"
+      android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       android:layout_marginBottom="32dp"
       android:layout_marginTop="-64dp"
diff --git a/app/src/main/res/values-sw720dp/bools.xml b/app/src/main/res/values-sw720dp-land/bools.xml
similarity index 100%
rename from app/src/main/res/values-sw720dp/bools.xml
rename to app/src/main/res/values-sw720dp-land/bools.xml