diff --git a/todo/static/todo/css/styles.css b/todo/static/todo/css/styles.css
index a20c4b8..3200eaf 100644
--- a/todo/static/todo/css/styles.css
+++ b/todo/static/todo/css/styles.css
@@ -15,15 +15,6 @@ ul.messages li {
 	color: gray;
 }
 
-a.todo {
-	text-decoration: none;
-	color: #474747;
-}
-
-a.showlink {
-	text-decoration: underline;
-}
-
 
 label {
 	display: block;
diff --git a/todo/templates/todo/add_external_task.html b/todo/templates/todo/add_task_external.html
similarity index 100%
rename from todo/templates/todo/add_external_task.html
rename to todo/templates/todo/add_task_external.html
diff --git a/todo/templates/todo/list_lists.html b/todo/templates/todo/list_lists.html
index c951932..979e3f1 100644
--- a/todo/templates/todo/list_lists.html
+++ b/todo/templates/todo/list_lists.html
@@ -15,7 +15,7 @@
         <ul>
             {% for item in group.list %}
    	            <li>
-                  <a class="todo" href="{% url 'todo:list_detail' item.id item.slug %}">{{ item.name }}</a>
+                  <a href="{% url 'todo:list_detail' item.id item.slug %}">{{ item.name }}</a>
                     ({{ item.list_detail.count }}/{{ item.item_set.count }})
                 </li>
             {% endfor %}
diff --git a/todo/templates/todo/view_task.html b/todo/templates/todo/task_detail.html
similarity index 80%
rename from todo/templates/todo/view_task.html
rename to todo/templates/todo/task_detail.html
index 47f627f..0da88a6 100644
--- a/todo/templates/todo/view_task.html
+++ b/todo/templates/todo/task_detail.html
@@ -26,11 +26,22 @@
             <p id="slideToggle" ><strong>&rarr; Click to edit details &larr;</strong></p>
 
             <p>
-                <strong>In list:</strong> <a href="{% url 'todo:list_detail' task.task_list.id task.task_list.slug %}" class="showlink">{{ task.list }}</a><br />
-                <strong>Assigned to:</strong> {% if task.assigned_to %}{{ task.assigned_to.get_full_name }}{% else %}Anyone{% endif %}<br />
-                <strong>Created by:</strong> {{ task.created_by.first_name }} {{ task.created_by.last_name }}<br />
-                <strong>Due date:</strong>  {{ task.due_date }}<br />
-                <strong>Completed:</strong> {{ form.completed }}<br />
+                <strong>In list:</strong>
+                  <a href="{% url 'todo:list_detail' task.task_list.id task.task_list.slug %}">
+                    {{ task.task_list }}
+                  </a><br />
+
+                <strong>Assigned to:</strong>
+                  {% if task.assigned_to %}{{ task.assigned_to.get_full_name }}{% else %}Anyone{% endif %}<br />
+
+                <strong>Created by:</strong>
+                  {{ task.created_by.first_name }} {{ task.created_by.last_name }}<br />
+
+                <strong>Due date:</strong>
+                  {{ task.due_date }}<br />
+
+                <strong>Completed:</strong>
+                  {{ form.completed }}<br />
             </p>
 
             {% if task.note %}
diff --git a/todo/views.py b/todo/views.py
index 67bbc7a..9e3da36 100644
--- a/todo/views.py
+++ b/todo/views.py
@@ -190,7 +190,7 @@ def task_detail(request, task_id):
     else:
         messages.info(request, "You do not have permission to view/edit this task.")
 
-    return render(request, 'todo/view_task.html', locals())
+    return render(request, 'todo/task_detail.html', locals())
 
 
 @csrf_exempt
@@ -247,7 +247,7 @@ def external_add(request):
     else:
         form = AddExternalItemForm()
 
-    return render(request, 'todo/add_external_task.html', locals())
+    return render(request, 'todo/add_task_external.html', locals())
 
 
 @user_passes_test(check_user_allowed)