diff --git a/backend/static/css/legends.css b/backend/static/css/legends.css
index 2290bd3..f46f33f 100644
--- a/backend/static/css/legends.css
+++ b/backend/static/css/legends.css
@@ -8,9 +8,24 @@ a {
     outline: 0;
 }
 
+.page-header {
+    display: flex;
+    width: 100%;
+}
+
+.page-tabs {
+    flex: 100%;
+    margin-right: 16px;
+}
+
+.page-map {
+    flex: 300px;
+}
+
 .object-map {
     float: right !important;
-    margin-top: -7px;
+    margin-left: 16px;
+    margin-bottom: 16px;
 }
 
 .popover {
diff --git a/backend/templates/entity.html b/backend/templates/entity.html
index 3eb90ed..f05799d 100644
--- a/backend/templates/entity.html
+++ b/backend/templates/entity.html
@@ -3,162 +3,170 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h3>{{ title .Name }}</h3>
-<p>
-    {{ .Race }}{{ if .Necromancer}} necromancer{{end}} {{ .Type }}
-    {{- if .Profession }}
-    of {{ .Profession }}s
-    {{- end }}
-    {{- if ne .Parent -1 }}
-    of {{ entity .Parent }}
-    {{- end }}
-    {{- if and (eq .Type "religion") (gt (len .WorshipId) 0) }}
-    centered around the worship of {{ hfList .WorshipId }}
-    {{- end }}
-    {{- if eq .Type "militaryunit" }}
-    {{- if gt (len .WorshipId) 0 }}
-    devoted to the worship of {{ hfList .WorshipId }}
-    {{- end }}
-    {{- if gt (len .WorshipId) 0 }}
-    , dedicated to the mastery of {{ andList .Weapons }}
-    {{- end }}
-    {{- end }}
-</p>
+<div class="page-header">
+    <div class="page-tabs">
 
-{{- if gt (len .Sites) 0 }}
-<div class="object-map">
-    <div id="map" style="width: 300px; height: 300px"></div>
-    <!-- <img class="site-map" src="$suburi/sitemap/$site.id" width="300" /> -->
-</div>
-{{initMap}}
-{{- range .Sites }}
-{{ addSite . false }}
-{{- end }}
-{{- end }}
+        <h3>{{ title .Name }}</h3>
+        <p>
+            {{ .Race }}{{ if .Necromancer}} necromancer{{end}} {{ .Type }}
+            {{- if .Profession }}
+            of {{ .Profession }}s
+            {{- end }}
+            {{- if ne .Parent -1 }}
+            of {{ entity .Parent }}
+            {{- end }}
+            {{- if and (eq .Type "religion") (gt (len .WorshipId) 0) }}
+            centered around the worship of {{ hfList .WorshipId }}
+            {{- end }}
+            {{- if eq .Type "militaryunit" }}
+            {{- if gt (len .WorshipId) 0 }}
+            devoted to the worship of {{ hfList .WorshipId }}
+            {{- end }}
+            {{- if gt (len .WorshipId) 0 }}
+            , dedicated to the mastery of {{ andList .Weapons }}
+            {{- end }}
+            {{- end }}
+        </p>
 
-<nav>
-    <div class="nav nav-tabs" id="nav-tab" role="tablist">
-        {{ $active := " active"}}
-        {{- if gt (len .Leaders) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-leaders" type="button" role="tab">Leaders</button>
-        {{ $active = ""}}{{- end}}
-        {{- if gt (len .Sites) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-sites" type="button" role="tab">Sites</button>
-        {{ $active = ""}}{{- end}}
-        {{- if gt (len .HistfigId) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-members" type="button" role="tab">Members</button>
-        {{ $active = ""}}{{- end}}
-        {{- if gt (len .Child) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-children" type="button" role="tab">Groups</button>
-        {{ $active = ""}}{{- end}}
-        {{- if gt (len .Wars) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-wars" type="button" role="tab">Wars</button>
-        {{ $active = ""}}{{- end}}
-    </div>
-</nav>
-<div class="tab-content" id="nav-tabContent">
-    {{ $active := " active"}}
-    {{- if gt (len .Leaders) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-leaders" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th>Date</th>
-                <th width="100%">Name</th>
-            </tr>
-            {{- range .Leaders }}
-            <tr>
-                <td>
-                    {{- if eq .EndYear -1 }}
-                    since {{ .StartYear }}
-                    {{- else }}
-                    from {{ .StartYear }} till {{ .EndYear }}
-                    {{- end }}
-                </td>
-                <td>
-                    {{ hf .Hf.Id }}</td>
-            </tr>
-            {{- end}}
-        </table>
-    </div>
-    {{ $active = ""}}{{- end}}
-    {{- if gt (len .Sites) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-sites" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless">
-            <tr>
-                <th>Name</th>
-                <th width="100%">History</th>
-            </tr>
-            {{- range .Sites }}
-            <tr>
-                <td class="object" style="vertical-align: top;"> {{ site . }}</td>
-                <td> {{ template "events.html" events (history .) }}</td>
-            </tr>
-            {{- end}}
-        </table>
-    </div>
-    {{ $active = ""}}{{- end}}
-    {{- if gt (len .HistfigId) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-members" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th width="100%">Type</th>
-            </tr>
-            {{- range .HistfigId }}
-            <tr>
-                <td>{{ hf .}}</td>
-            </tr>
-            {{- end}}
-        </table>
-    </div>
-    {{ $active = ""}}{{- end}}
-    {{- if gt (len .Child) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-children" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th width="100%">Type</th>
-            </tr>
-            {{- range .Child }}
-            <tr>
-                <td>{{ entity .}}</td>
-            </tr>
-            {{- end}}
-        </table>
-    </div>
-    {{ $active = ""}}{{- end}}
-    {{- if gt (len .Wars) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-wars" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th>Year</th>
-                <th>Name</th>
-                <th width="100%">Enemy</th>
-            </tr>
-            {{- range .Wars }}
-            <tr>
-                <td>
-                    {{- if eq .StartYear .EndYear}}
-                    In {{ .StartYear }}
-                    {{- else if eq .EndYear -1 }}
-                    Since {{ .StartYear }}
-                    {{- else }}
-                    From {{ .StartYear }} till {{ .EndYear }}
-                    {{- end }}
-                </td>
-                <td>{{ collection .Id}}</td>
-                <td>
-                    {{- if eq $.Id .Details.AggressorEntId}}
-                    attacking {{ entity .Details.DefenderEntId }}
-                    {{- else }}
-                    defending against {{ entity .Details.AggressorEntId }}
+        <nav>
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                {{ $active := " active"}}
+                {{- if gt (len .Leaders) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-leaders" type="button"
+                    role="tab">Leaders</button>
+                {{ $active = ""}}{{- end}}
+                {{- if gt (len .Sites) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-sites" type="button" role="tab">Sites</button>
+                {{ $active = ""}}{{- end}}
+                {{- if gt (len .HistfigId) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-members" type="button"
+                    role="tab">Members</button>
+                {{ $active = ""}}{{- end}}
+                {{- if gt (len .Child) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-children" type="button"
+                    role="tab">Groups</button>
+                {{ $active = ""}}{{- end}}
+                {{- if gt (len .Wars) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-wars" type="button" role="tab">Wars</button>
+                {{ $active = ""}}{{- end}}
+            </div>
+        </nav>
+        <div class="tab-content" id="nav-tabContent">
+            {{ $active := " active"}}
+            {{- if gt (len .Leaders) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-leaders" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th>Date</th>
+                        <th width="100%">Name</th>
+                    </tr>
+                    {{- range .Leaders }}
+                    <tr>
+                        <td>
+                            {{- if eq .EndYear -1 }}
+                            since {{ .StartYear }}
+                            {{- else }}
+                            from {{ .StartYear }} till {{ .EndYear }}
+                            {{- end }}
+                        </td>
+                        <td>
+                            {{ hf .Hf.Id }}</td>
+                    </tr>
                     {{- end}}
-                </td>
-            </tr>
-            {{- end}}
-        </table>
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            {{- if gt (len .Sites) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-sites" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless">
+                    <tr>
+                        <th>Name</th>
+                        <th width="100%">History</th>
+                    </tr>
+                    {{- range .Sites }}
+                    <tr>
+                        <td class="object" style="vertical-align: top;"> {{ site . }}</td>
+                        <td> {{ template "events.html" events (history .) }}</td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            {{- if gt (len .HistfigId) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-members" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th width="100%">Type</th>
+                    </tr>
+                    {{- range .HistfigId }}
+                    <tr>
+                        <td>{{ hf .}}</td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            {{- if gt (len .Child) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-children" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th width="100%">Type</th>
+                    </tr>
+                    {{- range .Child }}
+                    <tr>
+                        <td>{{ entity .}}</td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            {{- if gt (len .Wars) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-wars" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th>Year</th>
+                        <th>Name</th>
+                        <th width="100%">Enemy</th>
+                    </tr>
+                    {{- range .Wars }}
+                    <tr>
+                        <td>
+                            {{- if eq .StartYear .EndYear}}
+                            In {{ .StartYear }}
+                            {{- else if eq .EndYear -1 }}
+                            Since {{ .StartYear }}
+                            {{- else }}
+                            From {{ .StartYear }} till {{ .EndYear }}
+                            {{- end }}
+                        </td>
+                        <td>{{ collection .Id}}</td>
+                        <td>
+                            {{- if eq $.Id .Details.AggressorEntId}}
+                            attacking {{ entity .Details.DefenderEntId }}
+                            {{- else }}
+                            defending against {{ entity .Details.AggressorEntId }}
+                            {{- end}}
+                        </td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+        </div>
     </div>
-    {{ $active = ""}}{{- end}}
+    {{- if gt (len .Sites) 0 }}
+    <div class="page-map">
+        <div id="map" style="width: 300px; height: 300px"></div>
+        <!-- <img class="site-map" src="$suburi/sitemap/$site.id" width="300" /> -->
+        {{initMap}}
+        {{- range .Sites }}
+        {{ addSite . false }}
+        {{- end }}
+    </div>
+    {{- end }}
 </div>
 
+
 <h5>Events</h5>
 
 {{ template "events.html" events . }}
diff --git a/backend/templates/landmass.html b/backend/templates/landmass.html
index 907c58c..2606e8c 100644
--- a/backend/templates/landmass.html
+++ b/backend/templates/landmass.html
@@ -3,9 +3,6 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h1>{{ title .Name }}</h1>
-<p>landmass</p>
-
 <div class="object-map">
     <div id="map" style="width: 300px; height: 300px"></div>
 </div>
@@ -13,5 +10,8 @@
 {{ addLandmass .Id }}
 <script>map.addLayer(landmassesLayer);</script>
 
+<h1>{{ title .Name }}</h1>
+<p>landmass</p>
+
 <p>{{ json . }}</p>
 {{- end }}
\ No newline at end of file
diff --git a/backend/templates/mountain.html b/backend/templates/mountain.html
index add165d..cf66119 100644
--- a/backend/templates/mountain.html
+++ b/backend/templates/mountain.html
@@ -3,15 +3,15 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h3>{{ title .Name }}</h3>
-<p>{{ if .IsVolcano }}volcano{{else}}mountain{{end}}</p>
-
 <div class="object-map">
     <div id="map" style="width: 300px; height: 300px"></div>
 </div>
 {{initMap}}
 {{ addMountain .Id false }}
 
+<h3>{{ title .Name }}</h3>
+<p>{{ if .IsVolcano }}volcano{{else}}mountain{{end}}</p>
+
 <dl class="row">
     <dt class="col-2 col-lg-1">Height</dt>
     <dd class="col-10 col-lg-11">{{ .Height }}</dd>
diff --git a/backend/templates/site.html b/backend/templates/site.html
index c93357a..e3e74c1 100644
--- a/backend/templates/site.html
+++ b/backend/templates/site.html
@@ -3,64 +3,72 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h3>{{ title .Name }}</h3>
-<p>{{ .Type_ }}</p>
+<div class="page-header">
+    <div class="page-tabs">
+        <h3>{{ title .Name }}</h3>
+        <p>{{ .Type_ }}</p>
 
-<div class="object-map">
-    <div id="map" style="width: 300px; height: 300px"></div>
-    <!-- <img class="site-map" src="$suburi/sitemap/$site.id" width="300" /> -->
-</div>
-{{initMap}}
-{{ addSite .Id false }}
-
-<nav>
-    <div class="nav nav-tabs" id="nav-tab" role="tablist">
-        {{ $active := " active"}}
-        {{- if gt (len .Structures) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-structures" type="button"
-            role="tab">Structures</button>
-        {{ $active = ""}}{{- end}}
-        {{- if gt (len .SiteProperties) 0 }}
-        <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-site-properties" type="button"
-            role="tab">Properties</button>
-        {{ $active = ""}}{{- end}}
+        <nav>
+            <div class="nav nav-tabs" id="nav-tab" role="tablist">
+                {{ $active := " active"}}
+                {{- if gt (len .Structures) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-structures" type="button"
+                    role="tab">Structures</button>
+                {{ $active = ""}}{{- end}}
+                {{- if gt (len .SiteProperties) 0 }}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-site-properties" type="button"
+                    role="tab">Properties</button>
+                {{ $active = ""}}{{- end}}
+                <button class="nav-link{{$active}}" data-bs-toggle="tab" data-bs-target="#nav-history" type="button"
+                    role="tab">History</button>
+            </div>
+        </nav>
+        <div class="tab-content" id="nav-tabContent">
+            {{ $active := " active"}}
+            {{- if gt (len .Structures) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-structures" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th>Name</th>
+                        <th width="100%">Type</th>
+                    </tr>
+                    {{- range .Structures }}
+                    <tr>
+                        <td>{{ structure $.Id .Id }}</td>
+                        <td>{{ .Type }}{{if .Ruin}} (ruin){{end}}</td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            {{- if gt (len .SiteProperties) 0 }}
+            <div class="tab-pane{{$active}}" id="nav-site-properties" role="tabpanel">
+                <table class="table table-hover table-sm table-borderless object-table">
+                    <tr>
+                        <th>Type</th>
+                        <th width="100%">Name or Owner</th>
+                    </tr>
+                    {{- range .SiteProperties }}
+                    <tr>
+                        <td>{{ if ne .StructureId -1 }}{{ structure $.Id .StructureId }}{{else}}{{ .Type_ }}{{end}}</td>
+                        <td>{{ if ne .OwnerHfid -1 }}{{ hf .OwnerHfid }}{{else}}no
+                            owner{{ end }}</td>
+                    </tr>
+                    {{- end}}
+                </table>
+            </div>
+            {{ $active = ""}}{{- end}}
+            <div class="tab-pane{{$active}}" id="nav-history" role="tabpanel">
+                {{ template "events.html" events (history .Id) }}
+            </div>
+        </div>
     </div>
-</nav>
-<div class="tab-content" id="nav-tabContent">
-    {{ $active := " active"}}
-    {{- if gt (len .Structures) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-structures" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th>Name</th>
-                <th width="100%">Type</th>
-            </tr>
-            {{- range .Structures }}
-            <tr>
-                <td>{{ structure $.Id .Id }}</td>
-                <td>{{ .Type }}{{if .Ruin}} (ruin){{end}}</td>
-            </tr>
-            {{- end}}
-        </table>
+    <div class="page-map">
+        <div id="map" style="width: 300px; height: 300px"></div>
+        <!-- <img class="site-map" src="$suburi/sitemap/$site.id" width="300" /> -->
+        {{initMap}}
+        {{ addSite .Id false }}
     </div>
-    {{ $active = ""}}{{- end}}
-    {{- if gt (len .SiteProperties) 0 }}
-    <div class="tab-pane{{$active}}" id="nav-site-properties" role="tabpanel">
-        <table class="table table-hover table-sm table-borderless object-table">
-            <tr>
-                <th>Type</th>
-                <th width="100%">Name or Owner</th>
-            </tr>
-            {{- range .SiteProperties }}
-            <tr>
-                <td>{{ if ne .StructureId -1 }}{{ structure $.Id .StructureId }}{{else}}{{ .Type_ }}{{end}}</td>
-                <td>{{ if ne .OwnerHfid -1 }}{{ hf .OwnerHfid }}{{else}}no
-                    owner{{ end }}</td>
-            </tr>
-            {{- end}}
-        </table>
-    </div>
-    {{ $active = ""}}{{- end}}
 </div>
 
 <h5 class="mt-3">Events</h5>
diff --git a/backend/templates/structure.html b/backend/templates/structure.html
index 94f0a4f..7d212d7 100644
--- a/backend/templates/structure.html
+++ b/backend/templates/structure.html
@@ -3,15 +3,15 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h3>{{ title .Name }}</h3>
-{{ .Type_ }} in {{ site .SiteId }}
-
 <div class="object-map">
     <div id="map" style="width: 300px; height: 300px"></div>
 </div>
 {{initMap}}
 {{ addSite .SiteId false }}
 
+<h3>{{ title .Name }}</h3>
+{{ .Type_ }} in {{ site .SiteId }}
+
 <h5 class="mt-3">Events</h5>
 {{ template "events.html" events . }}
 
diff --git a/backend/templates/worldconstruction.html b/backend/templates/worldconstruction.html
index ea0466e..f60679f 100644
--- a/backend/templates/worldconstruction.html
+++ b/backend/templates/worldconstruction.html
@@ -3,15 +3,15 @@
 {{define "title"}}{{ title .Name }}{{end}}
 
 {{define "content"}}
-<h3>{{ title .Name }}</h3>
-<p>{{ .Type }}</p>
-
 <div class="object-map">
     <div id="map" style="width: 300px; height: 300px"></div>
 </div>
 {{initMap}}
 {{ addWorldConstruction .Id }}
 
+<h3>{{ title .Name }}</h3>
+<p>{{ .Type }}</p>
+
 {{- if gt (len .Parts) 0 }}
 <h5>Parts</h5>
 <ul>