diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index 28eb73d..b5fa95e 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -2,7 +2,7 @@
 			<input class="menu-btn" type="checkbox" id="menu-btn" />
 			
 			<div class="menu" >
-					<a href="/{{ .Language.LanguageCode }}" class="logo" >{{ .Site.Title }}</a>
+					<a href="/{{- .Language.LanguageCode -}}" class="logo" >{{- .Site.Title -}}</a>
 					<label class="menu-icon" for="menu-btn">
 						<div class="hamburger" onclick="myFunction(this)">
 							<div class="bar1"></div>
@@ -17,31 +17,31 @@
 					</label>
 
 					<div class="menu-entries">
-			{{ range.Site.Menus.main }}
-				{{ if eq .Identifier "home" }}
-						<a class="home-link" href="{{ .URL }}">{{ .Name }}</a>
-				{{ else }}
-						<a href="{{ .URL }}">{{ .Name }}</a>
-				{{ end }}
-			{{ end }}
-			{{ if gt (len .Site.Languages) 1  }}
-				{{ if and (gt (len .Site.Languages) (len .AllTranslations)) .Site.Params.allTranslated }}		
-  				{{ errorf "Error: %s is missing atleast 1 translation" .RelPermalink }}
-						{{ end }}
+			{{- range.Site.Menus.main -}}
+				{{- if eq .Identifier "home" -}}
+						<a class="home-link" href="{{- .URL -}}">{{- .Name -}}</a>
+				{{- else -}}
+						<a href="{{- .URL -}}">{{- .Name -}}</a>
+				{{- end -}}
+			{{- end -}}
+			{{- if gt (len .Site.Languages) 1  -}}
+				{{- if and (gt (len .Site.Languages) (len .AllTranslations)) .Site.Params.allTranslated -}}		
+  				{{- errorf "Error: %s is missing atleast 1 translation" .RelPermalink -}}
+						{{- end -}}
 						<div class="lang-switch" >
 							<input class="lang-btn" type="checkbox" id="lang-btn" />
 							<label class="lang-switch" for="lang-btn">
-								<a>{{ .Language.LanguageName }} ⏷</a>
+								<a>{{- .Language.LanguageName -}} ⏷</a>
 							</label>
 							<div class="translation-list" >
-						{{ with .Translations }}
-							{{ range . }}
-								<a href="{{ .RelPermalink }}"> {{ .Language.LanguageName }}</a>
-							{{ end }} 
-						{{ end }}
+						{{- with .Translations -}}
+							{{- range . -}}
+								<a href="{{- .RelPermalink -}}"> {{- .Language.LanguageName -}}</a>
+							{{- end -}} 
+						{{- end -}}
 							</div>
 						</div>
-			{{ end }}
+			{{- end -}}
 					</div>
 				</div>
 			</header>
diff --git a/layouts/shortcodes/calendar.html b/layouts/shortcodes/calendar.html
index 17bc3bd..89d8f13 100644
--- a/layouts/shortcodes/calendar.html
+++ b/layouts/shortcodes/calendar.html
@@ -58,4 +58,4 @@
     </div>
   {{ end }}
   </div>
-</div>
\ No newline at end of file
+</div>