diff -r c92596feac0d -r 714310efad8f project_files/Android-build/SDL-android-project/res/layout/fragment_map.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/fragment_map.xml	Mon Aug 20 20:16:37 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/fragment_map.xml	Mon Aug 20 20:19:35 2012 +0200
@@ -15,7 +15,6 @@
         android:layout_height="128dip"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_margin="5dip"
         android:background="@drawable/box"
         android:scaleType="fitCenter"
         android:src="@drawable/roomlist_preparing" />
@@ -27,7 +26,7 @@
         android:layout_below="@id/mapPreview"
         android:stretchColumns="1" >
 
-        <TableRow>
+        <TableRow android:layout_marginTop="5dip" >
 
             <TextView
                 android:layout_width="wrap_content"
@@ -38,10 +37,14 @@
                 android:id="@+id/spinMapType"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft = "5dip"
                 android:background="@drawable/dropdown" />
         </TableRow>
 
-        <TableRow android:id="@+id/rowMapName">
+        <TableRow
+            android:id="@+id/rowMapName"
+            android:layout_marginTop="5dip" >
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -52,34 +55,57 @@
                 android:id="@+id/spinMapName"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft = "5dip"
                 android:background="@drawable/dropdown" />
         </TableRow>
-		<TableRow android:id="@+id/rowTemplateFilter">
-		    <TextView
+
+        <TableRow
+            android:id="@+id/rowTemplateFilter"
+            android:layout_marginTop="5dip"
+            android:visibility="gone" >
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/map_template" />
-		    
+
             <Spinner
                 android:id="@+id/spinTemplateFilter"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft = "5dip"
                 android:background="@drawable/dropdown" />
-		</TableRow>
-		<TableRow android:id="@+id/rowMazeSize">
-		    <TextView
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/rowMazeSize"
+            android:layout_marginTop="5dip"
+            android:visibility="gone" >
+
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/map_maze_size" />
-		    
+
             <Spinner
                 android:id="@+id/spinMazeSize"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft = "5dip"
                 android:background="@drawable/dropdown" />
-		</TableRow>
+        </TableRow>
+
+        <Button
+            android:id="@+id/btnEditDrawnMap"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:background="@drawable/button"
+            android:enabled="false"
+            android:text="@string/map_button_editdrawnmap"
+            android:visibility="gone" />
     </TableLayout>
 
 </RelativeLayout>
\ No newline at end of file