diff --git a/mobile/res/layout/activity_main.xml b/mobile/res/layout/activity_main.xml
index 6aee890b..007f0c82 100644
--- a/mobile/res/layout/activity_main.xml
+++ b/mobile/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
         <com.cradle.iitc_mobile.IITC_WebView
             android:id="@+id/iitc_webview"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_weight="1"/>
 
         <ImageView
@@ -40,8 +40,9 @@
 
             <ImageButton
                 android:id="@+id/btnToggleMapVisibility"
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
+                android:layout_width="@dimen/button_size"
+                android:layout_height="@dimen/button_size"
+                android:layout_gravity="bottom"
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/toggle_map"
                 android:onClick="onToggleMapVisibility"
@@ -50,16 +51,17 @@
             <EditText
                 android:id="@+id/editCommand"
                 android:layout_width="0dp"
-                android:layout_height="fill_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:imeActionLabel="@string/debug_run"
                 android:imeOptions="actionGo"
                 android:inputType="textMultiLine|textNoSuggestions"
-                android:lines="1"/>
+                android:maxLines="4"/>
 
             <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="fill_parent"
+                android:layout_width="@dimen/button_size"
+                android:layout_height="@dimen/button_size"
+                android:layout_gravity="bottom"
                 android:background="@android:color/transparent"
                 android:contentDescription="@string/debug_run"
                 android:onClick="onBtnRunCodeClick"
diff --git a/mobile/res/values/styles.xml b/mobile/res/values/styles.xml
index d8351bc3..79064a63 100644
--- a/mobile/res/values/styles.xml
+++ b/mobile/res/values/styles.xml
@@ -19,4 +19,6 @@
 
     <color name="drawer_background">#99111111</color>
 
+    <dimen name="button_size">36dp</dimen>
+
 </resources>
\ No newline at end of file