--- a/gis_gui/blocks/map.html.pt	Fri Jan 27 09:43:40 2012 +0100
+++ b/gis_gui/blocks/map.html.pt	Fri Jan 27 12:15:29 2012 +0100
@@ -16,21 +16,6 @@
       <!-- Subscreens:  mapping setup, map  -->
       <div class="subscreen main">
       
-      <!--
-      <span jstcache="0" style="display: none;" id="view_rss"> 
-      <a jstcache="0" href="javascript:void(0)" id="view_rss_link">  <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon view-as-rss">  <span jstcache="0" class="link-text">RSS</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> </span>
-      <span jstcache="0" style="display: none;" id="view_kml"> 
-      <a jstcache="0" href="javascript:void(0)" id="view_kml_link"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon view-as-kml"> <span jstcache="0" class="link-text">In Google Earth anzeigen</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> </span> 
-      <a jstcache="0" style="display: none;" href="http://www.google.com/mapmaker?ll=51.151786,10.415039&amp;spn=19.842079,51.899414&amp;t=h&amp;z=5&amp;source=gm_el" id="mapmaker-link" jsaction="rmi.open-mapmaker"> <img jstcache="0" class="bar-icon" src="http://maps.gstatic.com/mapfiles/gw_link.png"> <span jstcache="0" class="link-text">Bearbeiten</span> </a> 
-      <img jstcache="0" style="display: none;" id="mapmaker-link-sep" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" href="javascript:void(0);" jsaction="print.show" id="print"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-print2"> <span jstcache="0" class="link-text">Drucken</span> </a> 
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" id="showsendtox" href="javascript:void(0);" jsaction="stx.show"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-email2"> <span jstcache="0" class="link-text">Senden</span> </a>  
-      <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon-divider bar-divider"> 
-      <a jstcache="0" href="http://maps.google.de/?ie=UTF8&amp;ll=51.151786,10.415039&amp;spn=19.842079,51.899414&amp;t=h&amp;z=5" jsaction="link.show" id="link"> <img jstcache="0" src="http://maps.gstatic.com/mapfiles/transparent.png" class="bar-icon bar-icon-link2"> <span jstcache="0" class="link-text">Link</span> </a> 
-	  -->
 	  
       <div class="map_box">[loading...]</div>
 
@@ -51,11 +36,17 @@
           <th>layer name</th>
         </tr>
       </table>
-      <p><input type="button" class="layer_add_button" value="Add layer" /></p>
-      <p><input type="button" class="map_update_button" value="Update map" /></p>
-      <p><input type="button" class="map_newwindow_button" value="New Window" /></p>
-      <p><input type="button" class="map_e4D_button" value="Europeana4D" /></p>
-        
+      <br/>
+     <table width="100%" class="map_layer_table">
+        <tr >
+          <td><input type="button" class="layer_add_button" value="Add layer" /></td>
+          <td><input type="button" class="map_newwindow_button" value="New Window" /></td>
+        </tr>
+        <tr >
+          <td><input type="button" class="map_update_button" value="Update map" /></td>
+          <td><input type="button" class="map_e4D_button" value="Europeana4D" /></td>
+        </tr>
+      </table>        
       </div>
 
       </div>