diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index d0c31bb112..67d64f3697 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -1,42 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
-    android:orientation="vertical">
+    android:background="@drawable/default_session_background" >
 
-    <EditText
-        style="@style/SmallSessionEditText"
-        android:id="@+id/nameEditText"
+    <LinearLayout
+        android:id="@+id/mainContentContainer"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <EditText
+            style="@style/SmallSessionEditText"
+            android:id="@+id/nameEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/large_spacing"
+            android:hint="Enter a group name" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/large_spacing"
+            android:layout_marginBottom="@dimen/medium_spacing"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
+            android:alpha="0.6"
+            android:textAlignment="center"
+            android:text="Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions." />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/separator" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/emptyStateContainer"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/large_spacing"
-        android:hint="Enter a group name" />
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/large_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:textSize="@dimen/small_font_size"
-        android:textColor="@color/text"
-        android:alpha="0.6"
-        android:textAlignment="center"
-        android:text="Closed groups are end-to-end encrypted group chats for up to 10 members. They provide the same privacy protections as one-on-one sessions." />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
+            android:text="You don't have any contacts yet" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        android:background="@color/separator" />
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/createNewPrivateChatButton"
+            android:layout_width="196dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:text="Start a Session" />
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
index 396676bbc1..d3fe0743ce 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/CreateClosedGroupActivity.kt
@@ -9,6 +9,7 @@ import android.support.v4.content.Loader
 import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_closed_group.*
 import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
@@ -38,6 +39,10 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
     private val selectedMembers: Set<String>
         get() { return createClosedGroupAdapter.selectedMembers }
 
+    companion object {
+        public val createNewPrivateChatResultCode = 100
+    }
+
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
@@ -45,12 +50,13 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         supportActionBar!!.title = "New Closed Group"
         recyclerView.adapter = createClosedGroupAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
+        createNewPrivateChatButton.setOnClickListener { createNewPrivateChat() }
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         menuInflater.inflate(R.menu.menu_create_closed_group, menu)
-        return true
+        return members.isNotEmpty()
     }
     // endregion
 
@@ -69,6 +75,9 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
 
     private fun update(members: List<String>) {
         this.members = members
+        mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
+        emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
+        invalidateOptionsMenu()
     }
     // endregion
 
@@ -82,6 +91,11 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         return super.onOptionsItemSelected(item)
     }
 
+    private fun createNewPrivateChat() {
+        setResult(createNewPrivateChatResultCode)
+        finish()
+    }
+
     override fun onMemberClick(member: String) {
         createClosedGroupAdapter.onMemberClick(member)
     }
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
index 44812f438d..f50167493b 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/activities/HomeActivity.kt
@@ -176,6 +176,13 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
 //            bottomSheet.show(supportFragmentManager, bottomSheet.tag)
 //        }
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == CreateClosedGroupActivity.createNewPrivateChatResultCode) {
+            createPrivateChat()
+        }
+    }
     // endregion
 
     override fun handleSeedReminderViewContinueButtonTapped() {
@@ -215,7 +222,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
 
     private fun createClosedGroup() {
         val intent = Intent(this, CreateClosedGroupActivity::class.java)
-        show(intent)
+        show(intent, true)
     }
 
     private fun joinPublicChat() {