diff --git a/add.html b/add.html
index a993215..2ab517a 100755
--- a/add.html
+++ b/add.html
@@ -75,6 +75,27 @@ Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
         <title>IngRRD - Add data</title>
     </head>
     <body>
+	<table style="border:1px solid black; border-collapse:collapse">
+		<tr>
+			<td style="border:1px solid black"><a href="/cgi/$webuser/?start=$start&amp;end=$end">Overview</a></td>
+			<td style="border:1px solid black">
+				<table>
+					<tr>
+						<td rowspan="2"><a href="?hist&amp;start=$start&amp;end=$end">History /</a></td>
+						<td>
+							<a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a>
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td style="background:black; color:white">Add data</td>
+		</tr>
+	</table>
     	<form method="post" action="add">
 		<ul>
 EOHTML
diff --git a/index b/index
index d49c1b9..545678c 100755
--- a/index
+++ b/index
@@ -169,11 +169,25 @@ then
 	if (( ! show_graphs ))
 	then
 		cat <<-EOHTML
-			<table>
+			<table style="border:1px solid black; border-collapse:collapse">
 				<tr>
 					<td style="background:black; color:white">Overview</td>
-					<td><a href="?hist">History / Trend</a></td>
-					<td><a href="add.html"><b>Add data</b></a></td>
+					<td style="border:1px solid black">
+						<table>
+							<tr>
+								<td rowspan="2"><a href="?hist&amp;start=$start&amp;end=$end">History /</a></td>
+								<td>
+									<a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a>
+								</td>
+							</tr>
+						</table>
+					</td>
+					<td style="border:1px solid black"><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td>
 				</tr>
 			</table>
 		EOHTML
@@ -461,11 +475,40 @@ then
 		EOHTML
 	else
 		cat <<-EOHTML
-			<table>
+			<table style="border:1px solid black; border-collapse:collapse">
 				<tr>
-					<td><a href="?">Overview</a></td>
-					<td style="background:black; color:white">History / Trend</td>
-					<td><a href="add.html"><b>Add data</b></a></td>
+					<td><a href="?start=$start&amp;end=$end">Overview</a></td>
+					<td style="background:black; color:white">
+						<table>
+							<tr>
+								<td rowspan="2">History /</td>
+		EOHTML
+		if (( show_all ))
+		then
+			cat <<-EOHTML
+					<td style="background:white; color:black">
+						<a href="?hist&amp;start=$start&amp;end=$end">Medals</a>
+					</td>
+				</tr>
+				<tr>
+					<td style="background:#505050; color:white">All</td>
+				</tr>
+			EOHTML
+		else
+			cat <<-EOHTML
+					<td style="background:#505050; color:white">Medals</td>
+				</tr>
+				<tr>
+					<td style="background:white; color:black">
+						<a href="?hist&amp;show=all&amp;start=$start&amp;end=$end">All</a>
+					</td>
+				</tr>
+			EOHTML
+		fi
+		cat <<-EOHTML
+						</table>
+					</td>
+					<td><a href="add.html?start=$start&amp;end=$end"><b>Add data</b></a></td>
 				</tr>
 			</table>
 					<table style="width:$(( graph_width + 97 ))px">
