diff --git a/templates/map/navbar.tmpl b/templates/map/navbar.tmpl
new file mode 100644
index 0000000000..137f077657
--- /dev/null
+++ b/templates/map/navbar.tmpl
@@ -0,0 +1,18 @@
+<div class="ui secondary pointing tabular top attached borderless stackable menu new-menu navbar">
+	<a class="{{if .PageIsMapRepositories}}active{{end}} item" href="{{AppSubUrl}}/map/rmap">
+		{{svg "octicon-repo"}} {{.i18n.Tr "explore.repos"}}
+	</a>
+	{{if not .UsersIsDisabled}}
+		<a class="{{if .PageIsMapUsers}}active{{end}} item" href="{{AppSubUrl}}/map/umap">
+			{{svg "octicon-person"}} {{.i18n.Tr "explore.users"}}
+		</a>
+	{{end}}
+	<a class="{{if .PageIsMapOrganizations}}active{{end}} item" href="{{AppSubUrl}}/map/orgmap">
+		{{svg "octicon-organization"}} {{.i18n.Tr "explore.organizations"}}
+	</a>
+	{{if .IsRepoIndexerEnabled}}
+	<a class="{{if .PageIsMapCode}}active{{end}} item" href="{{AppSubUrl}}/map/codemap">
+		{{svg "octicon-code"}} {{.i18n.Tr "explore.code"}}
+	</a>
+	{{end}}
+</div>
diff --git a/templates/map/umap.tmpl b/templates/map/umap.tmpl
index 7e014f1f6a..f320c689c9 100644
--- a/templates/map/umap.tmpl
+++ b/templates/map/umap.tmpl
@@ -1,6 +1,6 @@
 {{template "base/head" .}}
 <div class="page-content explore repositories">
-	{{template "explore/navbar" .}}
+	{{template "map/navbar" .}}
 	
 	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css" integrity="sha512-07I2e+7D8p6he1SIM+1twR5TIrhUQn9+I6yjqD53JQjFiMf8EtC93ty0/5vJTZGF8aAocvHYNEDJajGdNx1IsQ==" crossorigin="" />
 	<script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet-src.js" integrity="sha512-WXoSHqw/t26DszhdMhOXOkI7qCiv5QWXhH9R7CgvgZMHz1ImlkVQ3uNsiQKu5wwbbxtPzFXd1hK4tzno2VqhpA==" crossorigin=""></script>
@@ -10,9 +10,10 @@
 	
 	<style>
 	#map {
-		width: 800px; 
+		width: 100%; 
 		height: 600px; 
 		border: 1px solid #ccc;
+		z-index: 10;
 	}
 	
 	#progress {