diff --git a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/sections/AmpStructuresFormSectionFeature.html b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/sections/AmpStructuresFormSectionFeature.html
index 4308d11db6e..1c1d80ef875 100644
--- a/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/sections/AmpStructuresFormSectionFeature.html
+++ b/amp/WEB-INF/src/org/dgfoundation/amp/onepager/components/features/sections/AmpStructuresFormSectionFeature.html
@@ -1,73 +1,90 @@
 <wicket:extend>
-	<tr>
-		<td colspan="12">
-			<!-- Button Row -->
-			<div style="display: flex; gap: 10px; align-items: center;">
+		<tr>
+			<td colspan="4">
 				<span wicket:id="addbutton" />
-				<button wicket:id="importStructures">Import Structures</button>
-				<span wicket:id="exportStructures" style="background-color: #9fe170;" />
-			</div>
-
-			<!-- File Input Row -->
-			<div style="margin-top: 10px;">
-				<div style="white-space: nowrap;">
-					<span class="upfile" wicket:id="file" />
+			</td>
+			<td colspan="5">
+				<div wicket:id="resourcePanel">
+					<form wicket:id="form">
+						<table width="40%">
+							<tr>
+								<td colspan="2" style="text-align: center;">
+									<div style="display: flex; justify-content: space-between;">
+										<button wicket:id="importStructures">Import Structures</button>
+										<span wicket:id="exportStructures" style="background-color: #9fe170;"></span>
+										<a wicket:id="downloadLink" style="display:none;">Download</a>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td colspan="2">
+									<div style="white-space: nowrap;">
+										<span class="upfile" wicket:id="file" />
+									</div>
+								</td>
+							</tr>
+						</table>
+					</form>
 				</div>
-			</div>
-		</td>
-	</tr>
+				<br><br>
+			</td>
+			<td colspan="3">
+				<a wicket:id="downloadLink" style="display:none;">Download</a>
+				<span style="background-color: #9fe170;" wicket:id="exportStructures"/>
+			</td>
+		</tr>
+	<br>
+
+		<tr>
+			<td colspan="12">
+				<span wicket:id="listWithPaginator">
+	                <table class="inside" wicket:id="list">
+						<tr>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_header.gif" class="inside inside-header" colspan="7">
+								<b class="ins_header"><wicket:trn>Structure</wicket:trn></b>
+							</td>
+						</tr>
+						<tr>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title"><wicket:trn key="trn:title">Title</wicket:trn></b></td>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title"><wicket:trn key="trn:description">Description</wicket:trn></b></td>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title"><wicket:trn key="trn:latitude">Latitude</wicket:trn></b></td>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title"><wicket:trn key="trn:longitude">Longitude</wicket:trn></b></td>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title"><wicket:trn key="trn:shape">Shape</wicket:trn></b></td>
+							<td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left"><b class="ins_title">&nbsp;</b></td>
+						</tr>
+						<tr class="structureRow">
+							<td class="inside add_form_title"><span  wicket:id="name" /></td>
+							<td class="inside add_form_description"><span wicket:id="description" /></td>
+							<td class="inside add_form_latitude"><span wicket:id="latitude" /></td>
+							<td class="inside add_form_longtitude"><span wicket:id="longitude" /></td>
+							<td class="inside">
+
+							     <span wicket:id="openMapPopup" />
+			                     <span wicket:id=viewCoords/>
+	                            <div style="display:none; overflow: hidden;">
+	                               <span><input wicket:id="coords" style="width:2px;border: 1px solid #FFFFFF;background-color: #FFFFFF;color: white;overflow:hidden;" /></span> <span wicket:id="shape" />
+	                            </div>
+	                            <div style="display:none; overflow: hidden;">
+	                               <span><input wicket:id="tempId" style="width:2px;border: 1px solid #FFFFFF;background-color: #FFFFFF;color: white;overflow:hidden;" /></span>
+	                            </div>
+	                            <div style="display:none; overflow: hidden;">
+	                               <span><input wicket:id="structureColorId" style="width:2px;border: 1px solid #FFFFFF;background-color: #FFFFFF;color: white;overflow:hidden;" /></span>
+	                            </div>
+	                            <div id="dialog">
+	                            </div>
+	                        </td>
+							<td class="inside" align="left"><span wicket:id="deleteStructure"/></td>
+						</tr>
+	                    <!--
+						<tr>
+							<td colspan="7"><span wicket:id="structureImgList" /></td>
+						</tr>
+						-->
+						<tr style="background-color: white;"><td colspan="7">&nbsp;</td></tr>
+					</table>
+	                <span wicket:id="paging" />
+                </span>
+			</td>
+		</tr>
 
-	<!-- Main Table Content -->
-	<tr>
-		<td colspan="12">
-            <span wicket:id="listWithPaginator">
-                <table class="inside" wicket:id="list">
-                    <tr>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_header.gif" class="inside inside-header" colspan="7">
-                            <b class="ins_header"><wicket:trn>Structure</wicket:trn></b>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title"><wicket:trn key="trn:title">Title</wicket:trn></b>
-                        </td>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title"><wicket:trn key="trn:description">Description</wicket:trn></b>
-                        </td>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title"><wicket:trn key="trn:latitude">Latitude</wicket:trn></b>
-                        </td>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title"><wicket:trn key="trn:longitude">Longitude</wicket:trn></b>
-                        </td>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title"><wicket:trn key="trn:shape">Shape</wicket:trn></b>
-                        </td>
-                        <td background="/TEMPLATE/ampTemplate/img_2/ins_bg.gif" class="inside" align="left">
-                            <b class="ins_title">&nbsp;</b>
-                        </td>
-                    </tr>
-                    <tr class="structureRow">
-                        <td class="inside add_form_title"><span wicket:id="name" /></td>
-                        <td class="inside add_form_description"><span wicket:id="description" /></td>
-                        <td class="inside add_form_latitude"><span wicket:id="latitude" /></td>
-                        <td class="inside add_form_longitude"><span wicket:id="longitude" /></td>
-                        <td class="inside">
-                            <span wicket:id="openMapPopup" />
-                            <span wicket:id="viewCoords" />
-                            <div style="display:none; overflow: hidden;">
-                                <span><input wicket:id="coords" style="width:2px;border: 1px solid #FFFFFF;background-color: #FFFFFF;color: white;overflow:hidden;" /></span>
-                                <span wicket:id="shape" />
-                            </div>
-                        </td>
-                        <td class="inside" align="left"><span wicket:id="deleteStructure" /></td>
-                    </tr>
-                    <tr style="background-color: white;">
-                        <td colspan="7">&nbsp;</td>
-                    </tr>
-                </table>
-                <span wicket:id="paging" />
-            </span>
-		</td>
-	</tr>
 </wicket:extend>