--- a/templates/base.html	Wed Feb 24 14:47:29 2010 +0530
+++ b/templates/base.html	Wed Feb 24 15:10:03 2010 +0530
@@ -134,6 +134,7 @@
                 <li><a href="/user/notifications/" title="notifications">notifications</a></li>
                 <li><a href="/user/requests/" title="Requests">requests</a></li>
                 <br>
+                <li><a href="/user/view/uid={{user.id}}">my profile</a></li>
                 <li><a href="/accounts/logout/">logout</a></li>
             {% else %}
                 <li><a href="/accounts/login/" title="login">login</a></li>

--- a/templates/index.html	Wed Feb 24 14:47:29 2010 +0530
+++ b/templates/index.html	Wed Feb 24 15:10:03 2010 +0530
@@ -9,11 +9,7 @@
             <a href="/task/view/tid={{ task.id }}">{{ task.title }}</a><br />
         {% endfor %}
     {% else %}
-        Welcome {{ user.username }} <br />
-        <a href="/accounts/logout/">logout</a><br />
-        <br />
-        <a href="/task/browse/">Tasks</a><br />
-        <a href="/user/view/uid={{user.id}}">My Profile</a><br />
+        Logged in as {{ user.username }} <br />
     {% endif %}
     {% if can_create_task %}
         <a href="/task/create/">Create a task</a><br />

--- a/templates/task/claim.html	Wed Feb 24 14:47:29 2010 +0530
+++ b/templates/task/claim.html	Wed Feb 24 15:10:03 2010 +0530
@@ -8,7 +8,8 @@
             {{claim.message}}<br />
         {% endfor %}
     {% else %}
-        There are no claims for task <a href="/task/view/tid={{task.id}}">{{task.title}}</a> yet.
+        There are no claims for this task yet.<br />
+        <a href="/task/view/tid={{task.id}}">Click here</a> to return to the task.
     {% endif %}
     {% if task_claimed and is_mentor %}
         <a href="/task/assign/tid={{task.id}}">Assign task</a>

--- a/templates/task/view.html	Wed Feb 24 14:47:29 2010 +0530
+++ b/templates/task/view.html	Wed Feb 24 15:10:03 2010 +0530
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
     {% if task_viewable %}
-        <a href="/task/browse/">Browse tasks</a>
+        <a href="/task/edit/tid={{task.id}}">Edit task</a>
         <h3>{{ task.title }}</h3><br />
         <!-- we have to write our own datetime.strftime filter and use in the next line -->
         created by <a href="/user/view/uid={{ task.created_by.id }}">{{ task.created_by.username }}</a> on {{ task.creation_datetime.ctime }}<br />
@@ -13,7 +13,7 @@
             <a href="/user/view/uid={{mentor.id}}">{{mentor.username}}|</a>
         {% endfor %}
         {% if can_mod_mentors %}
-            <br /><a href="/task/addmentor/tid={{task.id}}">Add another Mentor to this task</a><br />
+            <a href="/task/addmentor/tid={{task.id}}">Add another Mentor to this task</a><br />
             edit task goes here and it should contain all those add subs and add deps depending on availability<br />
         {% endif %}