diff --git a/templates/default/sidebar.html.twig b/templates/default/sidebar.html.twig
index 23eb601..466e559 100644
--- a/templates/default/sidebar.html.twig
+++ b/templates/default/sidebar.html.twig
@@ -1,14 +1,16 @@
+<div id='sidebar-header'>
+    <!-- Search -->
+    {% if app.user %}
+    <section id="search" class="alt">
+        <input type="text" name="query" id="query" placeholder="Search by title, passage, or note" />
+    </section>
+    {% endif %}
+    <a class='toggle' href='' id='sidebar-link'>Toggle</a>
+</div>
+
 <!-- Sidebar -->
 <div id="sidebar">
     <div class="inner">
-
-        <!-- Search -->
-        {% if app.user %}
-        <section id="search" class="alt">
-            <input type="text" name="query" id="query" placeholder="Search by title, passage, or note" />
-        </section>
-        {% endif %}
-
         <!-- Menu -->
         <nav id="menu">
             <header class="major">
@@ -20,16 +22,16 @@
             <ul>
                 {% if app.user %}
                 <li><a href='/home'>Home</a></li>
-                <li><a href="#" onclick='newNote()'>New Note</a></li>
-                <li><a href='#' onclick='openNote()'>Open Note</a></li>
-                <li><a href="#" onclick="saveNote()">Save Note</a></li>
+                <li><a onclick='note.newNote()'>New Note</a></li>
+                <li><a onclick='note.openNote()'>Open Note</a></li>
+                <li><a onclick="note.saveNote()">Save Note</a></li>
                 {% if isAdmin is defined and isAdmin %}
                 <li><a href='/reference-editor'>Reference Editor</a></li>
                 {% if xferDB is defined and xferDB %}
                 <li><a href='/xfer-database'>Transfer Database</a></li>
                 {% endif %}
                 {% endif %}
-                <li><a href='#' onclick="openRef()">Open Reference</a></li>
+                <li><a onclick="openRef()">Open Reference</a></li>
                 <li><a href='/template-editor'>Template Editor</a></li>
                 <li><a href='/cheat-sheet' target='_blank'>Markdown Cheat Sheet</a></li>
                 {% else %}
@@ -50,7 +52,7 @@
                 {% for n in last4Notes %}
                 <article>
                     <p>{{ n.date|date("m/d/Y") }}</p>
-                    <a href="#" onclick="retrieveNote('{{ n.id }}');openNote();">{{ n.title }}</a>
+                    <a onclick="note.retrieveNote('{{ n.id }}');note.openNote();">{{ n.title }}</a>
                     <p>{{ n.passage }}</p>
                 </article>
                 {% endfor %}
@@ -70,5 +72,4 @@
             </ul>
         </section>
     </div>
-    <a class='toggle' href='#sidebar' id='sidebar-link'>Toggle</a>
 </div>