diff --git a/auth/src/main/res/layout/dialog_fragment_configure_workspace.xml b/auth/src/main/res/layout/dialog_fragment_configure_workspace.xml
index 1610f695783bb9f1d5dc43f5f4da7d860161ab34..1c2e6e035598c6911371339726824026636c7e04 100644
--- a/auth/src/main/res/layout/dialog_fragment_configure_workspace.xml
+++ b/auth/src/main/res/layout/dialog_fragment_configure_workspace.xml
@@ -28,10 +28,23 @@
         android:id="@+id/tvMessage"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="center_horizontal"
+        android:text="@string/setup_workspace_message"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbarDivider" />
 
+    <View
+        android:id="@+id/messageDivider"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginTop="8dp"
+        android:background="@color/divider_color"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvWorkspaceTasks"
         android:layout_width="0dp"
@@ -40,7 +53,17 @@
         app:layout_constraintBottom_toTopOf="@id/btbCreate"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvMessage" />
+        app:layout_constraintTop_toBottomOf="@id/messageDivider" />
+
+    <View
+        android:id="@+id/buttonDivider"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginBottom="8dp"
+        android:background="@color/divider_color"
+        app:layout_constraintBottom_toTopOf="@id/btbCreate"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <org.futo.circles.core.view.LoadingButton
         android:id="@+id/btbCreate"
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 3367489037acb063d64e7c5668b508c8c6626b48..c2a716a45bcf4073e49c1baf11bc8910388b94df 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -128,8 +128,17 @@
     <string name="family">Family</string>
     <string name="community">Community</string>
     <string name="retry">Retry</string>
-
-
+    <string name="setup_workspace_message">In order to use app we needs to configure your workspace. \nWe will create root spaces listed below and setup all the necessary relations between them.</string>
+    <string name="root_space_description">Root space of workspace hierarchy</string>
+    <string name="groups_space_description">Space which will contain all the Groups</string>
+    <string name="circles_space_description">Space which will contain all the Circles</string>
+    <string name="galleries_space_description">Space which will contain all the Galleries</string>
+    <string name="people_space_description">Space which will contain all the connected users</string>
+    <string name="profile_space_description">Space which will contain all your public Circles. Other users will be able to ask to join this space to follow you</string>
+    <string name="photos_room_description">Optional: Photos gallery room for your media. You will be able to create it anytime</string>
+    <string name="friends_circle_description">Optional: Circle to follow your friends timelines. You will be able to create it anytime</string>
+    <string name="family_circle_description">Optional: Circle to follow your family members timelines. You will be able to create it anytime</string>
+    <string name="community_circle_description">Optional: Circle to follow other people timelines. You will be able to create it anytime</string>
 
 
     <string name="circle_explanation"><![CDATA[Tip: A <b>circle</b> works like a secure, private version of Facebook or Twitter.  Everyone posts to their own timeline, and you see posts from all the timelines that you\'re following.