diff --git a/css/questionset.css b/css/questionset.css
index 83e6722..1dd1011 100644
--- a/css/questionset.css
+++ b/css/questionset.css
@@ -31,12 +31,14 @@
   height: 10px;
   border-radius: 50%;
   border: 1px solid #494949;
+  margin: 0 3px;
 }
 .progress-dot.answered {
   background: #494949;
 }
 .progress-dot.current {
-  box-shadow: 0px 0px 6px #494949;
+  box-shadow: 1px 1px 4px #494949;
+  margin: -1px 4px 1px 2px;
 }
 .intro-page {
   /*background-color: rgba(255,255,255,0.9);*/
@@ -84,14 +86,10 @@
   padding: 0;
 }
 .qs-footer .button {
-  width: 80px;
-  height: 40px;
-  border: 1px solid #bababa;
-  border-radius: 4px;
   position: absolute;
   top: 0;
-  cursor: pointer;
 }
+
 .qs-footer .button.next {
   right: 100px;
 }
diff --git a/js/questionset.js b/js/questionset.js
index 98c57c2..001fb74 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -24,7 +24,7 @@ H5P.QuestionSet = function (options, contentId) {
 '<div class="intro-page">' +
 '  <div class="title"><%= introPage.title %></div>' +
 '  <div class="introduction"><%= introPage.introduction %></div>' +
-'  <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>' +
+'  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>' +
 '</div>' +
 '<%} %>' +
 '<div class="questionset hidden">' +
@@ -46,9 +46,9 @@ H5P.QuestionSet = function (options, contentId) {
 '        <span class="progress-text"></span>' +
 '      <% } %>' +
 '    </div>' +
-'    <button class="prev button"><%= texts.prevButton %></button>' +
-'    <button class="next button"><%= texts.nextButton %></button>' +
-'    <button class="finish button"><%= texts.finishButton %></button>' +
+'    <a class="prev button"><%= texts.prevButton %></a>' +
+'    <a class="next button"><%= texts.nextButton %></a>' +
+'    <a class="finish button"><%= texts.finishButton %></a>' +
 '  </div>' +
 '</div>' +
   '';
@@ -58,7 +58,7 @@ H5P.QuestionSet = function (options, contentId) {
 '  <div class="greeting"><%= greeting %></div>' +
 '  <div class="score <%= scoreclass %>"><%= score %></div>' +
 '  <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>' +
-'  <div class="buttons"><button class="qs-finishbutton"><%= finishButtonText %></button></div>' +
+'  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></divbutton >' +
 '</div>' +
 '';
 
diff --git a/views/questionset-results.ejs b/views/questionset-results.ejs
index 170b60a..722776d 100644
--- a/views/questionset-results.ejs
+++ b/views/questionset-results.ejs
@@ -2,5 +2,5 @@
   <div class="greeting"><%= greeting %></div>
   <div class="score <%= scoreclass %>"><%= score %></div>
   <div class="resulttext <%= scoreclass %>"><%= resulttext %></div>
-  <div class="buttons"><button class="qs-finishbutton"><%= finishButtonText %></button></div>
+  <div class="buttons"><a class="button qs-finishbutton"><%= finishButtonText %></a></div>
 </div>
diff --git a/views/questionset.ejs b/views/questionset.ejs
index ddd133f..6d0278e 100644
--- a/views/questionset.ejs
+++ b/views/questionset.ejs
@@ -2,7 +2,7 @@
 <div class="intro-page">
   <div class="title"><%= introPage.title %></div>
   <div class="introduction"><%= introPage.introduction %></div>
-  <div class="buttons"><button id="qs-startbutton"><%= introPage.startButtonText %></button></div>
+  <div class="buttons"><a id="qs-startbutton" class="button"><%= introPage.startButtonText %></a></div>
 </div>
 <%} %>
 <div class="questionset hidden">
@@ -24,8 +24,8 @@
         <span class="progress-text"></span>
       <% } %>
     </div>
-    <button class="prev button"><%= texts.prevButton %></button>
-    <button class="next button"><%= texts.nextButton %></button>
-    <button class="finish button"><%= texts.finishButton %></button>
+    <a class="prev button"><%= texts.prevButton %></a>
+    <a class="next button"><%= texts.nextButton %></a>
+    <a class="finish button"><%= texts.finishButton %></a>
   </div>
 </div>