diff --git a/issue/models.py b/issue/models.py
index 6b57a14..babcdb2 100644
--- a/issue/models.py
+++ b/issue/models.py
@@ -245,9 +245,9 @@ class Event(models.Model):
     def glyphicon(self):
 
         if self.code == Event.COMMENT:
-            return "bullhorn"
+            return "comment"
         elif self.code == Event.DESCRIBE:
-            return "pencil"
+            return "edit"
         elif self.code == Event.CLOSE:
             return "ban-circle"
         elif self.code == Event.REOPEN:
diff --git a/issue/templates/issue/issue_list.html b/issue/templates/issue/issue_list.html
index 9b7c88f..17fa6fe 100644
--- a/issue/templates/issue/issue_list.html
+++ b/issue/templates/issue/issue_list.html
@@ -8,7 +8,7 @@
 
 <div class="panel panel-default">
 
-  <div class="panel-heading">
+  <div class="panel-heading clearfix">
     <h1>
       Issues
       <div class="pull-right">
@@ -59,7 +59,11 @@
         {% endfor %}
         <br />
         <small>#{{ issue.id }} opened by <a href="{% url 'list-issue' project.name %}?q=is:open%20author:{{ issue.author.username }}"><strong>{{ issue.author.username }}</strong></a> {{ issue.opened_at|naturaltime }}</small>
-        <span class="badge">{{ issue.comments.count }}</span>
+        {% if issue.milestone %}
+        &#160;–&#160;&#160;<span class="glyphicon glyphicon-road"></span> {{ issue.milestone }}
+        {% endif %}
+        <!--&#160;&#160;<span class="badge"><span class="glyphicon glyphicon-comment"></span> {{ issue.comments.count }}</span>-->
+        &#160;–&#160;&#160;<span class="badge">{{ issue.comments.count }}</span>
       </td>
     </tr>
     {% endfor %}
diff --git a/issue/templates/issue/label_list.html b/issue/templates/issue/label_list.html
index 58a2254..721b7a4 100644
--- a/issue/templates/issue/label_list.html
+++ b/issue/templates/issue/label_list.html
@@ -6,7 +6,7 @@
 
 <div class="panel panel-default">
 
-  <div class="panel-heading">
+  <div class="panel-heading clearfix">
     <h1>
       Labels
       <div class="pull-right">
@@ -20,18 +20,10 @@
     {% for label in labels %}
     <tr>
       <td>
-        <a href="{% url 'list-issue' project.name %}?q=is:open%20label:{{ label.name }}">
-          <button class="btn" style="{{ label.style }}">
-            <span class="glyphicon glyphicon-tag" style="font-size: 100%;"></span> {{ label }}
-          </button>
-        </a>
+        <a href="{% url 'list-issue' project.name %}?q=is:open%20label:{{ label.name }}"><button class="btn" style="{{ label.style }}"><span class="glyphicon glyphicon-tag" style="font-size: 100%;"></span> {{ label }}</button></a>
         <div class="pull-right">
-          <a href="{% url 'edit-label' project.name label.id %}">
-            <button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button>
-          </a>
-          <a href="{% url 'delete-label' project.name label.id %}">
-            <button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button>
-          </a>
+          <a href="{% url 'edit-label' project.name label.id %}"><button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
+          <a href="{% url 'delete-label' project.name label.id %}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
         </div>
       </td>
     </tr>
diff --git a/issue/templates/issue/milestone_list.html b/issue/templates/issue/milestone_list.html
index 3f3eec9..ff775cb 100644
--- a/issue/templates/issue/milestone_list.html
+++ b/issue/templates/issue/milestone_list.html
@@ -6,7 +6,7 @@
 
 <div class="panel panel-default">
 
-  <div class="panel-heading">
+  <div class="panel-heading clearfix">
     <h1>
       Milestone
       <div class="pull-right">
@@ -21,19 +21,15 @@
     <tr>
       <td>
         <div class="pull-right">
-          <a href="{% url 'edit-milestone' project.name milestone.name %}">
-            <button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button>
-          </a>
-          <a href="{% url 'delete-milestone' project.name milestone.name %}">
-            <button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button>
-          </a>
+          <a href="{% url 'edit-milestone' project.name milestone.name %}"><button class="btn btn-primary"><span class="glyphicon glyphicon-edit"></span> Edit</button></a>
+          <a href="{% url 'delete-milestone' project.name milestone.name %}"><button class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Delete</button></a>
         </div>
         <b style="font-size: 200%;">
           <a href="{% url 'list-issue' project.name %}?q=is:open%20milestone:{{ milestone.name }}">{{ milestone }}</a>
         </b>
         &#160;
         <small>
-          <span class="glyphicon glyphicon-calendar"></span> {% if milestone.due_date %}Due by {{ milestone.due_date }}{% else %}No due date{% endif %}
+          <span style="white-space: nowrap;"><span class="glyphicon glyphicon-calendar"></span> {% if milestone.due_date %}Due by {{ milestone.due_date }}{% else %}No due date{% endif %}</span>
         </small>
         <br /><br />
         <div class="progress">
diff --git a/issue/urls.py b/issue/urls.py
index 6c5d3d7..f99c026 100644
--- a/issue/urls.py
+++ b/issue/urls.py
@@ -7,13 +7,13 @@ urlpatterns = [
     url(r'^(?P<project>[a-z0-9_-]+)/delete$', 'issue.views.project_delete', name='delete-project'),
     url(r'^(?P<project>[a-z0-9_-]+)/issues$', 'issue.views.issue_list', name='list-issue'),
     url(r'^(?P<project>[a-z0-9_-]+)/issues/add$', 'issue.views.issue_edit', name='add-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)$', 'issue.views.issue', name='show-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/edit$', 'issue.views.issue_edit', name='edit-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/close$', 'issue.views.issue_close', name='close-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/reopen$', 'issue.views.issue_reopen', name='reopen-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/comment$', 'issue.views.issue_comment', name='comment-issue'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/comments/(?P<comment>[0-9]+)/edit$', 'issue.views.issue_comment', name='edit-comment'),
-    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<id>[0-9]+)/delete$', 'issue.views.issue_delete', name='delete-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)$', 'issue.views.issue', name='show-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/edit$', 'issue.views.issue_edit', name='edit-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/close$', 'issue.views.issue_close', name='close-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/reopen$', 'issue.views.issue_reopen', name='reopen-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/comment$', 'issue.views.issue_comment', name='comment-issue'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/comments/(?P<comment>[0-9]+)/edit$', 'issue.views.issue_comment', name='edit-comment'),
+    url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/delete$', 'issue.views.issue_delete', name='delete-issue'),
     url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-label/(?P<label>[0-9]+)$', 'issue.views.issue_add_label', name='add-label-to-issue'),
     url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/remove-label/(?P<label>[0-9]+)$', 'issue.views.issue_remove_label', name='remove-label-from-issue'),
     url(r'^(?P<project>[a-z0-9_-]+)/issues/(?P<issue>[0-9]+)/add-milestone/(?P<milestone>[a-z0-9_.-]+)$', 'issue.views.issue_add_milestone', name='add-milestone-to-issue'),
diff --git a/issue/views.py b/issue/views.py
index 75aff93..d20413f 100644
--- a/issue/views.py
+++ b/issue/views.py
@@ -215,12 +215,12 @@ def issue_list(request, project):
 
     return render(request, 'issue/issue_list.html', c)
 
-def issue_edit(request, project, id=None):
+def issue_edit(request, project, issue=None):
 
     project = get_object_or_404(Project, name=project)
 
-    if id:
-        issue = get_object_or_404(Issue, project__name=project.name, id=id)
+    if issue:
+        issue = get_object_or_404(Issue, project__name=project.name, id=issue)
         init_data = {'title': issue.title,
                      'description': issue.description}
     else:
@@ -284,9 +284,9 @@ def issue_edit(request, project, id=None):
 
     return render(request, 'issue/issue_edit.html', c)
 
-def issue(request, project, id):
+def issue(request, project, issue):
 
-    issue = get_object_or_404(Issue, project__name=project, id=id)
+    issue = get_object_or_404(Issue, project__name=project, id=issue)
 
     projects = Project.objects.all()
     labels = Label.objects.filter(project=issue.project, deleted=False) \
@@ -309,9 +309,9 @@ def issue(request, project, id):
 
     return render(request, 'issue/issue.html', c)
 
-def issue_comment(request, project, id, comment=None):
+def issue_comment(request, project, issue, comment=None):
 
-    issue = get_object_or_404(Issue, project__name=project, id=id)
+    issue = get_object_or_404(Issue, project__name=project, id=issue)
 
     if comment:
         event = get_object_or_404(Event, code=Event.COMMENT, issue=issue, id=comment)
@@ -361,9 +361,9 @@ def issue_comment(request, project, id, comment=None):
 
     return render(request, 'issue/issue_comment.html', c)
 
-def issue_close(request, project, id):
+def issue_close(request, project, issue):
 
-    issue = get_object_or_404(Issue, project__name=project, id=id, closed=False)
+    issue = get_object_or_404(Issue, project__name=project, id=issue, closed=False)
 
     issue.closed = True
     issue.save()
@@ -374,9 +374,9 @@ def issue_close(request, project, id):
 
     return redirect('list-issue', project)
 
-def issue_reopen(request, project, id):
+def issue_reopen(request, project, issue):
 
-    issue = get_object_or_404(Issue, project__name=project, id=id, closed=True)
+    issue = get_object_or_404(Issue, project__name=project, id=issue, closed=True)
 
     issue.closed = False
     issue.save()
@@ -387,9 +387,9 @@ def issue_reopen(request, project, id):
 
     return redirect('show-issue', project, issue.id)
 
-def issue_delete(request, project, id):
+def issue_delete(request, project, issue):
 
-    issue = get_object_or_404(Issue, project__name=project, id=id)
+    issue = get_object_or_404(Issue, project__name=project, id=issue)
 
     issue.delete()