diff --git a/app/app.iml b/app/app.iml
index fc05d73..7e5adb2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <afterSyncTasks>
@@ -47,7 +46,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,25 +60,23 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-core/2.2.2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support.test.espresso/espresso-idling-resource/2.2.2/jars" />
@@ -99,10 +94,15 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
diff --git a/app/src/main/res/layout/dialog_main.xml b/app/src/main/res/layout/dialog_main.xml
index fec6754..da0792a 100644
--- a/app/src/main/res/layout/dialog_main.xml
+++ b/app/src/main/res/layout/dialog_main.xml
@@ -1,20 +1,31 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/MainWrapper"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    tools:context=".view.MainDialog">
-
-    <de.dotwee.micropinner.view.custom.DialogHeaderView
-        android:id="@+id/dialogHeaderView"
-        style="@style/DialogView" />
-
-    <de.dotwee.micropinner.view.custom.DialogContentView
-        android:id="@+id/dialogContentView"
-        style="@style/DialogView" />
-
-    <de.dotwee.micropinner.view.custom.DialogFooterView
-        android:id="@+id/dialogFooterView"
-        style="@style/DialogView" />
-
-</LinearLayout>
+<ScrollView android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:id="@+id/scrollView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        style="@style/MainWrapper"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:context=".view.MainDialog">
+
+        <de.dotwee.micropinner.view.custom.DialogHeaderView
+            android:id="@+id/dialogHeaderView"
+            style="@style/DialogView" />
+
+        <de.dotwee.micropinner.view.custom.DialogContentView
+            android:id="@+id/dialogContentView"
+            style="@style/DialogView" />
+
+        <de.dotwee.micropinner.view.custom.DialogFooterView
+            android:id="@+id/dialogFooterView"
+            style="@style/DialogView" />
+
+    </LinearLayout>
+
+
+</ScrollView>
+
+
diff --git a/app/src/main/res/layout/dialog_main_content.xml b/app/src/main/res/layout/dialog_main_content.xml
index 4a687f3..d60c75b 100644
--- a/app/src/main/res/layout/dialog_main_content.xml
+++ b/app/src/main/res/layout/dialog_main_content.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    style="@style/DialogContent.Table">
+
+<TableLayout style="@style/DialogContent.Table"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TableRow style="@style/DialogView">
 
         <TextView
             style="@style/DialogText.Description"
             android:layout_column="0"
+            android:layout_span="2"
             android:text="@string/input_description_title" />
-
-        <TextView
-            style="@style/DialogText.Description"
-            android:layout_column="1"
-            android:text="@string/input_description_content" />
     </TableRow>
 
     <TableRow style="@style/DialogView">
@@ -21,12 +18,26 @@
             android:id="@+id/editTextTitle"
             style="@style/DialogInput.EditText"
             android:layout_column="0"
+            android:layout_span="2"
             android:hint="@string/input_hint_title" />
+    </TableRow>
+
+    <TableRow style="@style/DialogView">
+
+        <TextView
+            style="@style/DialogText.Description"
+            android:layout_column="0"
+            android:layout_span="2"
+            android:text="@string/input_description_content" />
+    </TableRow>
+
+    <TableRow style="@style/DialogView">
 
         <EditText
             android:id="@+id/editTextContent"
             style="@style/DialogInput.EditText"
-            android:layout_column="1"
+            android:layout_column="0"
+            android:layout_span="2"
             android:hint="@string/input_hint_content" />
     </TableRow>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ec90b80..976c9ae 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -52,11 +52,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
 
-        <item name="android:paddingLeft">@dimen/dialog_content_padding_24</item>
-        <item name="android:paddingRight">@dimen/dialog_content_padding_24</item>
-
-        <item name="android:paddingTop">@dimen/dialog_content_padding_16</item>
-        <item name="android:paddingBottom">@dimen/dialog_content_padding_16</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
 
         <item name="android:minWidth">256dp</item>
         <item name="android:maxWidth">384dp</item>