diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 8ba9f44..608b016 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,7 +1,7 @@
 <footer>
-	<p>&copy; {{ now.Year }} <a href="{{ .Site.BaseURL }}"><b>{{ if .Site.Copyright }}{{ .Site.Copyright }}{{ else }}{{ .Site.Title }}{{ end }}</b></a>.
-	{{- range .Site.Menus.footer }}
-	<a href="{{ .URL }}"><b>{{ .Name }}</b></a>.
-        {{- end }}
+	<p>&copy; {{ now.Year }} <a href="{{ .Site.BaseURL }}"><b>{{ if .Site.Copyright }}{{ .Site.Copyright }}{{ else }}{{ .Site.Title }}{{ end }}</b></a> .
+		{{- range $i, $e := .Site.Menus.footer }}
+			<a href="{{ $e.URL }}"><b>{{ $e.Name }}</b></a>{{ if ne (sub (len $.Site.Menus.footer) 1) $i }} . {{ end }}
+		{{- end }}
 	</p>
 </footer>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 8675636..cf813a7 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,7 +8,7 @@
 			<a href="/"><b>Home</b></a> .
 			{{ with .Site.Menus.main }}
 				{{ range $i, $e := . }}
-				<a href="{{ $e.URL | relURL }}"><b>{{ $e.Name }}</b></a>{{ if ne (len .Site.Menus.main) $i }} . {{ end }}
+				<a href="{{ $e.URL | relURL }}"><b>{{ $e.Name }}</b></a>{{ if ne (sub (len $.Site.Menus.main) 1) $i }} . {{ end }}
 				{{ end }}
 			{{ end }}
 	</nav>