diff --git a/index.html b/index.html
index 77941be..51bb976 100644
--- a/index.html
+++ b/index.html
@@ -17,15 +17,12 @@
     <div id="content">
         <div class="content-panel">
             <div class="nav-bar">
-                <button id="review-button" class="navigation nav-right"><b>☰</b></button>
-                <button id="nav-submit-button" class="submit-button navigation nav-right"><b>submit</b></button>
-                <!--<button id="options-button" class="navigation nav-right"
-                    title="click to load new packet or manage saved answers">options</button>-->
-                <button id="review-overlay-button" class="navigation nav-right"
+                <button id="btn-review" class="navigation nav-right"><b>☰</b></button>
+                <button id="btn-submit-nav" class="submit-button navigation nav-right"><b>submit</b></button>
+                <button id="btn-review-overlay" class="navigation nav-right"
                     title="click to finish exam and review answers">review</button>
-                <button id="fullscreen-overlay-button" class="navigation nav-right"
+                <button id="btn-fullscreen-overlay" class="navigation nav-right"
                     title="click to toggle fullscreen">fullscreen</button>
-                <!--<button id="logout-button" class="navigation nav-right">logout</button>-->
                 <div class="app-name nav-left">RTS</div>
                 <div id="timer" title="click to pause"></div>
                 <div class="exam-name" title="currently loaded packet"></div>
@@ -160,7 +157,7 @@
         <div class="dialog-text">
             Allocated time has ended. You can review or continue.
         </div>
-        <button id="time-up-review-button" class="navigation dialog-review">Review</button>
+        <button id="btn-time-up-review" class="navigation dialog-review">Review</button>
         <button id="time-up-continue-button" class="navigation dialog-yes">Continue</button>
         <button id="dialog-submit-button" class="submit-button navigation dialog-review hidden"><b>submit</b></button>
     </div>
@@ -171,7 +168,7 @@
             Candidate number: <input type="number" id="candidate-number" name="candidate" required size="10"><br />
             Passcode: <input type="text" id="passcode" name="passcode" required size="10"><br />
         </div>
-        <button id="login-button" class="navigation dialog-yes">Login</button>
+        <button id="btn-login" class="navigation dialog-yes">Login</button>
     </div>
 
     <div id="loading" class="fullscreen-overlay">
diff --git a/js/interact.js b/js/interact.js
index c9a9050..2827d5e 100644
--- a/js/interact.js
+++ b/js/interact.js
@@ -138,7 +138,7 @@ function submissionError(data, answer_json, exam_details) {
       )}</p></span></div>`
     );
 
-    $("#nav-submit-button").prependTo("#submit-error-overlay");
+    $("#btn-submit-nav").prependTo("#submit-error-overlay");
 
     $("#submit-error-overlay").height(docHeight);
 
diff --git a/js/main.js b/js/main.js
index a5eadd3..96a8a36 100644
--- a/js/main.js
+++ b/js/main.js
@@ -933,7 +933,7 @@ function setUpQuestions(load_previous) {
   //question_type = questions[Object.keys(questions)[0]].type;
 
   if (exam_details.exam_mode) {
-    $("#options-button, #review-overlay-button").hide();
+    $("#options-button, #btn-review-overlay").hide();
   } else {
     $(".submit-button").hide();
   }
@@ -1728,7 +1728,7 @@ $(".submit-button").click(function(evt) {
   interact.submitAnswers(exam_details, db, config);
 });
 
-$("#review-button").click(function(evt) {
+$("#btn-review").click(function(evt) {
   $(".question-list-panel").toggle();
 });
 
@@ -1737,7 +1737,7 @@ $("#options-button").click(function(evt) {
   $("#options-panel").toggle();
 });
 
-$("#review-overlay-button").click(function(evt) {
+$("#btn-review-overlay").click(function(evt) {
   if (review_mode == true) {
     reviewQuestions();
   } else {
@@ -1745,7 +1745,7 @@ $("#review-overlay-button").click(function(evt) {
   }
 });
 
-$("#fullscreen-overlay-button").click(function(evt) {
+$("#btn-fullscreen-overlay").click(function(evt) {
   if (document.fullscreen == false) {
     document.documentElement.requestFullscreen();
   } else {
@@ -1753,13 +1753,13 @@ $("#fullscreen-overlay-button").click(function(evt) {
   }
 });
 
-$("#finish-exam, #time-up-review-button").click(function(evt) {
+$("#finish-exam, #btn-time-up-review").click(function(evt) {
   review_mode = true;
   reviewQuestions();
   $.modal.close();
 });
 
-$("#time-up-continue-button").click(function(evt) {
+$("#btn-time-up-continue").click(function(evt) {
   $.modal.close();
 });
 
@@ -2476,7 +2476,7 @@ $("#btn-user-login").click(function(evt) {
 
 
 
-$("#login-button").click(function(evt) {
+$("#btn-login").click(function(evt) {
   global_cid = parseInt($("#candidate-number").val());
   global_passcode = $("#passcode").val();
 
@@ -2513,7 +2513,7 @@ $(".start-packet-button").click(function(evt) {
   timer.addEventListener("targetAchieved", function(e) {
     if (exam_details.exam_mode == true) {
       $(
-        "#dialog-submit-button, #time-up-review-button, #time-up-continue-button"
+        "#btn-dialog-submit, #btn-time-up-review, #btn-time-up-continue"
       ).toggle();
       $("#time-up-dialog .dialog-text").text(
         "Allocated time has ended. Click to submit answers."