diff --git a/_layouts/default.html b/_layouts/default.html
index fa3091b..3485770 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -34,7 +34,7 @@
 				<a href='/' {%- if page.title == "Home" %} class='current'{% endif -%}>Home</a>
 				{%- for html_page in site.content -%}
 					{%- unless html_page.title == 'Home' -%}
-						<a href='{{ html_page.url }}' {%- if page.title == html_page.title %} class='current'{% endif -%}>
+						<a href='{{ html_page.url }}' {%- if page.title == html_page.title or layout.sidebar_title == html_page.title %} class='current'{% endif -%}>
 							{{ html_page.title }}
 						</a>
 					{%- endunless -%}
diff --git a/_layouts/project.html b/_layouts/project.html
index 13b6d1e..9cb41f4 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -1,7 +1,7 @@
 ---
 layout: default
+sidebar_title: Projects
 ---
-{% comment %}<h1>{{ page.name }}</h1>{% endcomment %}
 <div class='subheading-links'>
 	{% if page.source %}<a href='{{ page.source }}'>Source code</a>{% endif %}
 	{% if page.website %}<a href='{{ page.website }}'>Website</a>{% endif %}