diff --git a/amanuensis/templates/lexicon/lexicon.html b/amanuensis/templates/lexicon/lexicon.html
index 32fbe91..3c1838f 100644
--- a/amanuensis/templates/lexicon/lexicon.html
+++ b/amanuensis/templates/lexicon/lexicon.html
@@ -12,10 +12,10 @@
 
 {% block sb_logo %}{% endblock %}
 {% block sb_home %}<a href="{{ url_for('home.home') }}">Home</a>{% endblock %}
-{% block sb_contents %}<a href="{{ url_for('lexicon.contents', name=lexicon.name) }}">Contents</a>{% endblock %}
-{% block sb_rules %}<a href="{{ url_for('lexicon.rules', name=lexicon.name) }}">Rules</a>{% endblock %}
-{% block sb_session %}<a href="{{ url_for('lexicon.session', name=lexicon.name) }}">Session</a>{% endblock %}
-{% block sb_stats %}<a href="{{ url_for('lexicon.stats', name=lexicon.name) }}">Statistics</a>{% endblock %}
+{% block sb_contents %}<a href="{{ url_for('lexicon.contents', name=g.lexicon.name) }}">Contents</a>{% endblock %}
+{% block sb_rules %}<a href="{{ url_for('lexicon.rules', name=g.lexicon.name) }}">Rules</a>{% endblock %}
+{% block sb_session %}<a href="{{ url_for('lexicon.session', name=g.lexicon.name) }}">Session</a>{% endblock %}
+{% block sb_stats %}<a href="{{ url_for('lexicon.stats', name=g.lexicon.name) }}">Statistics</a>{% endblock %}
 
 {% set template_sidebar_rows = [
 	self.sb_logo(),
diff --git a/amanuensis/templates/lexicon/session.html b/amanuensis/templates/lexicon/session.html
index 8a33b16..51d4941 100644
--- a/amanuensis/templates/lexicon/session.html
+++ b/amanuensis/templates/lexicon/session.html
@@ -8,7 +8,7 @@
 
 {% if current_user.id == g.lexicon.editor %}
 {% block editor_edit %}
-<a href="{{ url_for('lexicon.session_edit', name=lexicon.name) }}" style="display:block; text-align:center;">Edit lexicon settings</a>
+<a href="{{ url_for('lexicon.session_edit', name=g.lexicon.name) }}" style="display:block; text-align:center;">Edit lexicon settings</a>
 {% endblock %}
 {% set template_content_blocks = [self.editor_edit()] + template_content_blocks %}
 {% endif %}
\ No newline at end of file