6 files changed, 13 insertions, 12 deletions
diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html
index ae86ed1..2d42b34 100644
--- a/testapp/templates/exam/add_question.html
+++ b/testapp/templates/exam/add_question.html
@@ -21,7 +21,7 @@ table th, table td {
 {{ form.as_table }}
 </table>
 <center><button class="btn" type="submit" name="savequestion">Save</button>
-<button class="btn" type="reset" name="reset">Clear</button> </center>
+<button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/questions/");'>Cancel</button> </center>
 </form>
 {% endblock %}
 
diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html
index fa0e516..bad1765 100644
--- a/testapp/templates/exam/grade_user.html
+++ b/testapp/templates/exam/grade_user.html
@@ -32,7 +32,7 @@ Start time: {{ paper.start_time }} <br/>
 {% if paper.answers.count %}
 <h3> Answers </h3><br>
 <form id="q{{ paper.quiz.id }}_form"
-    action="{{URL_ROOT}}/exam/grade_user/{{data.user.username}}/" method="post">
+    action="{{URL_ROOT}}/exam/manage/grade_user/{{data.user.username}}/" method="post">
 {% csrf_token %}
 {% for question, answers in paper.get_question_answers.items %}
 <p><strong> 
@@ -71,11 +71,11 @@ Marks: <input id="q{{ question.id }}" type="text"
 {% endif %} {# if data.papers #}
 
 {% if data.papers.count > 1 %}
-<a href="{{URL_ROOT}}/exam/monitor/">
+<a href="{{URL_ROOT}}/exam/manage/monitor/">
     Monitor quiz</a>
 {% else %}
 {% with data.papers.0 as paper %}
-<a href="{{URL_ROOT}}/exam/monitor/{{paper.quiz.id}}/">
+<a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.quiz.id}}/">
     Monitor quiz</a>
 {% endwith %}
 {% endif %}
diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html
index 4847545..a802de2 100644
--- a/testapp/templates/exam/monitor.html
+++ b/testapp/templates/exam/monitor.html
@@ -20,7 +20,7 @@
 
 <ul>
 {% for quiz in quizzes %}
-<li><a href="{{URL_ROOT}}/exam/monitor/{{quiz.id}}/">{{ quiz.description }}</a></li>
+<li><a href="{{URL_ROOT}}/exam/manage/monitor/{{quiz.id}}/">{{ quiz.description }}</a></li>
 {% endfor %}
 </ul>
 {% endif %}
diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html
index ad9534f..038cb8b 100644
--- a/testapp/templates/exam/showusers.html
+++ b/testapp/templates/exam/showusers.html
@@ -5,8 +5,9 @@
 List of Users 
 {% endblock %}
 
+
 {% block manage %}
 {% for name in user %}
-<a href="{{URL_ROOT}}/exam/grade_user/{{ name }}">{{ name }}</a><br>
+<a href="{{URL_ROOT}}/exam/manage/grade_user/{{ name }}">{{ name }}</a><br>
 {% endfor %}
 {% endblock %}
diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html
index b9cbbb5..c835f61 100644
--- a/testapp/templates/exam/user_data.html
+++ b/testapp/templates/exam/user_data.html
@@ -30,7 +30,7 @@ Last login: {{ data.user.last_login }}
 </p>
 
 {% if data.papers %}
-<p><a href="{{URL_ROOT}}/exam/grade_user/{{ data.user.username }}/">
+<p><a href="{{URL_ROOT}}/exam/manage/grade_user/{{ data.user.username }}/">
     Grade/correct paper</a>
 </p>
 
@@ -75,15 +75,15 @@ User IP address: {{ paper.user_ip }}
 {% endif %} {# if data.papers #}
 <br />
 <hr />
-<a href="{{URL_ROOT}}/exam/grade_user/{{ data.user.username }}/">
+<a href="{{URL_ROOT}}/exam/manage/grade_user/{{ data.user.username }}/">
     Grade/correct paper</a>
 <br/>
 {% if data.papers.count > 1 %}
-<a href="{{URL_ROOT}}/exam/monitor/">
+<a href="{{URL_ROOT}}/exam/manage/monitor/">
     Monitor quiz</a>
 {% else %}
 {% with data.papers.0 as paper %}
-<a href="{{URL_ROOT}}/exam/monitor/{{paper.quiz.id}}/">
+<a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.quiz.id}}/">
     Monitor quiz</a>
 {% endwith %}
 {% endif %}
diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html
index c757523..a21e8c4 100644
--- a/testapp/templates/manage.html
+++ b/testapp/templates/manage.html
@@ -25,8 +25,8 @@
 	 <div class="span4">
                  <h5>Manage</h5>
                  <ul>
-                 <li><a href="{{ URL_ROOT }}/exam/manage/addquestion">Add Questions</a></li>
-                 <li><a href="{{ URL_ROOT }}/exam/manage/addquiz">Add Quiz</a></li>
+                 <li><a href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
+                 <li><a href="{{ URL_ROOT }}/exam/manage/addquiz">Quizzes</a></li>
                  <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
                  <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
                  </ul>