diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index decb9b42..b9c48bf4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -149,7 +149,11 @@
             </intent-filter>
         </service>
 
-        <activity android:name=".activities.CreateContentActivity"></activity>
+        <activity
+            android:name=".activities.CreateContentActivity"
+            android:configChanges="orientation|screenSize"
+            android:parentActivityName=".activities.main.MainActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_content.xml b/app/src/main/res/layout/activity_create_content.xml
index 220de6e4..4e596664 100644
--- a/app/src/main/res/layout/activity_create_content.xml
+++ b/app/src/main/res/layout/activity_create_content.xml
@@ -5,7 +5,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".activities.CreateContentActivity"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -38,6 +39,7 @@
             android:id="@+id/subject_input"
             android:layout_width="240dp"
             android:layout_height="wrap_content"
+            android:layout_below="@id/appbar"
             android:hint="@string/subject">
 
             <android.support.design.widget.TextInputEditText