diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index 41ac510..f3d91b8 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -57,7 +57,7 @@
     {% endfor %}
 </section>
 
-<table class="list issues sortable">
+<table id="pagure-issues-list" class="table table-sm">
     <thead>
         <tr>
             <th>#</th>
@@ -124,4 +124,3 @@
 </table>
 
 {% endblock %}
-
diff --git a/pagure/templates/master.html b/pagure/templates/master.html
index 42c6cb9..2115790 100644
--- a/pagure/templates/master.html
+++ b/pagure/templates/master.html
@@ -111,10 +111,6 @@
             filename='jquery-ui-1.11.2.custom.min.js') }}">
     </script>
     <script type="text/javascript"
-        src="{{ url_for('static',
-            filename='sorttable.js') }}">
-    </script>
-    <script type="text/javascript"
         src="https://ryanlerch.fedorapeople.org/fedora-bootstrap/fedora-bootstrap.js">
     </script>
     {% endblock %}
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index ed32b71..bf5bcd2 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -10,74 +10,159 @@
 
 {% block repo %}
 <div class="row">
-  <div class="col-md-8">
-    {% if readme %}
-      <section class="readme">
-        {% if safe %}
-          {{ readme | noJS |safe }}
-        {% else %}
-          {{ readme | noJS }}
-        {% endif %}
-      </section>
-    {% endif %}
-  </div>
-  <div class="col-md-4">
-    <div class="card">
-      <div class="card-header">
-        Admins
+  {% if origin == 'view_repo' or origin == 'view_repo_branch' %}
+    <div class="col-md-8">
+      {% if readme %}
+        <section class="readme">
+          {% if safe %}
+            {{ readme | noJS |safe }}
+          {% else %}
+            {{ readme | noJS }}
+          {% endif %}
+        </section>
+      {% endif %}
+    </div>
+    <div class="col-md-4">
+      <div class="card">
+        <div class="card-header">
+          Admins
+        </div>
+        <div class="card-block p-a-0">
+          <ul>
+            <li>
+              <a href="{{ url_for('view_user', username=repo.user.user)}}">
+                {{ repo.user.user | avatar(32) | safe }}
+                {{ repo.user.fullname }} ({{ repo.user.user }})  -  creator
+              </a>
+            </li>
+            {% for user in repo.users %}
+            <li>
+              <a href="{{ url_for('view_user', username=user.user)}}">
+                {{ user.user | avatar(32) | safe }}
+                {{ user.fullname }} ({{ user.user }})
+              </a>
+            </li>
+            {% endfor %}
+            {% for group in repo.groups %}
+            <li>
+              <a href="{{ url_for('view_group', group=group.group_name)}}">
+                @{{ group.group_name }}
+              </a>
+            </li>
+            {% endfor %}
+          </ul>
+        </div>
       </div>
-      <div class="card-block p-a-0">
-        <ul>
-          <li>
-            <a href="{{ url_for('view_user', username=repo.user.user)}}">
-              {{ repo.user.user | avatar(32) | safe }}
-              {{ repo.user.fullname }} ({{ repo.user.user }})  -  creator
-            </a>
-          </li>
-          {% for user in repo.users %}
-          <li>
-            <a href="{{ url_for('view_user', username=user.user)}}">
-              {{ user.user | avatar(32) | safe }}
-              {{ user.fullname }} ({{ user.user }})
-            </a>
-          </li>
-          {% endfor %}
-          {% for group in repo.groups %}
+
+      <div class="card">
+        <div class="card-header">
+          Recent Commits
+        </div>
+        <div class="card-block p-a-0">
+        {% for commit in last_commits %}
+        <li>
+          {{ commit.author | author2avatar(20) | safe }}
+          <a href="{{ url_for('view_commit', username=username,
+                  repo=repo.name, commitid=commit.hex) }}">
+              <span class="commitid">{{ commit.hex|short }}</span>
+              {% if diff_commits and commit.oid.hex in diff_commits %}
+              <span class="new_commit" title="Commit not in the main repo">*</span>
+              {% endif %}
+              {{ commit.message.split('\n')[0] }}
+              <span class="commitdate" title="{{ commit.commit_time|format_ts }}">
+                {{ commit.commit_time|humanize }}
+              </span>
+          </a>
+        </li>
+        {% endfor %}
+        </div>
+      </div>
+
+      <div class="card">
+        <div class="card-header">
+          Branches
+        </div>
+        <div class="card-block p-a-0">
+          {% for branch in branches %}
           <li>
-            <a href="{{ url_for('view_group', group=group.group_name)}}">
-              @{{ group.group_name }}
+            <a href="{{ url_for('view_repo_branch',
+                        username=username, repo=repo.name, branchname=branch) }}">
+              {{ branch }}
             </a>
+            (<a href="{{ url_for('view_commits', username=username,
+                       repo=repo.name, branchname=branch) }}">commits</a>)
+
           </li>
           {% endfor %}
-        </ul>
+        </div>
       </div>
-    </div>
 
-    <div class="card">
-      <div class="card-header">
-        Recent Commits
-      </div>
-      <div class="card-block p-a-0">
-      {% for commit in last_commits %}
-      <li>
-        {{ commit.author | author2avatar(20) | safe }}
-        <a href="{{ url_for('view_commit', username=username,
-                repo=repo.name, commitid=commit.hex) }}">
-            <span class="commitid">{{ commit.hex|short }}</span>
-            {% if diff_commits and commit.oid.hex in diff_commits %}
-            <span class="new_commit" title="Commit not in the main repo">*</span>
+      <div class="card">
+        <div class="card-header">
+          Branches
+        </div>
+        <div class="card-block p-a-0">
+          <table>
+            <tr>
+              <th>Git URLs</th>
+              <td><a id="more_gits">more</a> | </td>
+              <td>
+                <a href="{{ url_for('ssh_hostkey') }}">
+                  SSH Hostkey/Fingerprint
+                </a>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Project</td>
+              <td>:</td>
+              <td>
+                {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+              </td>
+              <td>
+                {{ config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+              </td>
+            </tr>
+            {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %}
+            <tr class="extra_gits">
+              <td>Docs</td>
+              <td>:</td>
+              <td>
+                {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
+              </td>
+              <td>
+                {{ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git
+              </td>
+            </tr>
             {% endif %}
-            {{ commit.message.split('\n')[0] }}
-            <span class="commitdate" title="{{ commit.commit_time|format_ts }}">
-              {{ commit.commit_time|humanize }}
-            </span>
-        </a>
-      </li>
-      {% endfor %}
+            {% if config.get('ENABLE_TICKETS', True) %}
+            <tr class="extra_gits">
+              <td>Tickets</td>
+              <td>:</td>
+              <td>
+                {{ config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git
+              </td>
+              <td>
+                {{ config.get('GIT_URL_GIT') }}tickets/{{ repo.fullname }}.git
+              </td>
+            </tr>
+            {% endif %}
+            <tr class="extra_gits">
+              <td>Requests</td>
+              <td>:</td>
+              <td>
+                {{ config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git
+              </td>
+              <td>
+                {{ config.get('GIT_URL_GIT') }}requests/{{ repo.fullname }}.git
+              </td>
+            </tr>
+          </table>
+        </div>
       </div>
-    </div>
 
-  </div>
+    </div>
+  {% endif %}
 </div>
 
 
@@ -112,24 +197,26 @@
 
 {% else %}
 
-  <section class="branch_list">
-    <h3>Branches</h3>
-    <ul>
-      {% for branch in branches %}
-      <li>
-        <a href="{{ url_for('view_repo_branch',
-                    username=username, repo=repo.name, branchname=branch) }}">
-          {{ branch }}
-        </a>
-        (<a href="{{ url_for('view_commits', username=username,
-                   repo=repo.name, branchname=branch) }}">commits</a>)
+  {% if total_page %}
 
+  <nav>
+    <ul class="pagination">
+      <li {% if page <= 1%} class="disabled" {% endif %}>
+        <a href="{{ url_for('.%s' % origin, username=username,
+                    repo=repo.name, branchname=branchname, page=page-1) }}" aria-label="Previous">
+          <span aria-hidden="true">Newer</span>
+          <span class="sr-only">Newer</span>
+        </a>
+      </li>
+      <li class="active"><a href="#">page {{ page }} of {{total_page}}</a></li>
+      <li {% if page >= total_page %}class="disabled"{%endif%}>
+        <a href="{{ url_for('.%s' % origin, username=username,repo=repo.name, branchname=branchname, page=page+1) }}" aria-label="Next">
+          <span aria-hidden="true">Older</span>
+          <span class="sr-only">Older</span>
+        </a>
       </li>
-      {% endfor %}
     </ul>
-  </section>
-
-  {% if total_page %}
+  </nav>
   <table>
     <tr>
       <td>
@@ -156,106 +243,26 @@
     </tr>
   </table>
   {% endif %}
-
-<!--  <section class="commit_list">
     {% if origin == 'view_commits' %}
-    <h3>Commits list</h3>
-    {% else %}
-    <h3>Last {{ last_commits | length }} commits</h3>
-    {% endif %}
-    {% if diff_commits and authenticated %}
-    <span id="request_pull" class="inline_it">
-        <a href="{{ url_for('new_request_pull',
-            username=username, repo=repo.name,
-            branch_to=head, branch_from=branchname or 'master') }}">
-          {% if repo_admin %}Request pull{% else %}Compare{% endif %}
-        </a>
-    </span>
-    {% elif authenticated %}
-    <span id="request_pull" class="inline_it">
-        <a href="{{ url_for('new_remote_request_pull',
-            username=username, repo=repo.name) }}">
-          Open a remote pull-request
-        </a>
-    </span>
-    {% endif %}
-    {% if repo_admin and branchname and branchname != 'master' %}
-    <form action="{{
-        url_for('.delete_branch',
-                username=username, repo=repo.name, branchname=branchname)
-        }}" method="post" class="inline_it icon del_icon">
-        {{ form.csrf_token }}
-        <button
-            onclick="return confirm('Are you sure you want to remove this branch?\nThis cannot be un-done!');"
-          title="Remove branch {{ branchname }}">
-          <span class="icon icon-trash blue"> Delete branch</span>
-        </button>
-    </form>
+      <div class="list-group">
+        {% for commit in last_commits %}
+          <a href="{{ url_for('view_commit', username=username,
+                          repo=repo.name, commitid=commit.hex) }}" class="list-group-item">
+                      <h5><strong>{{ commit.message.split('\n')[0] }}</strong></h5>
+                  {{ commit.author | author2avatar(20) | safe }} {{ commit.author.name }}
+                      <span class="commitid">{{ commit.hex|short }}</span>
+                      {% if diff_commits and commit.oid.hex in diff_commits %}
+                      <span class="new_commit" title="Commit not in the main repo">*</span>
+                      {% endif %}
+                      <span class="commitdate" title="{{ commit.commit_time|format_ts }}">
+                        {{ commit.commit_time|humanize }}
+                      </span>
+          </a>
+        {% endfor %}
+      </div>
     {% endif %}
-  </section>-->
-
   <section class="git_links">
-    <table>
-      <tr>
-        <th>Git URLs</th>
-        <td>
-          {% if authenticated and repo_admin %}
-          <a id="more_gits">more</a> | </td>
-          {% endif %}
-        <td>
-          <a href="{{ url_for('ssh_hostkey') }}">
-            SSH Hostkey/Fingerprint
-          </a>
-        </td>
-        <td></td>
-      </tr>
-      <tr>
-        <td>Project</td>
-        <td>:</td>
-        <td>
-          {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
-        </td>
-        <td>
-          {{ config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
-        </td>
-      </tr>
-      {% if config['DOC_APP_URL'] and repo and repo.settings.get('project_documentation', True) %}
-      <tr class="extra_gits">
-        <td>Docs</td>
-        <td>:</td>
-        <td>
-          {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
-        </td>
-        <td>
-          {{ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git
-        </td>
-      </tr>
-      {% endif %}
-      {% if authenticated and repo_admin %}
-      {% if config.get('ENABLE_TICKETS', True) %}
-      <tr class="extra_gits">
-        <td>Tickets</td>
-        <td>:</td>
-        <td>
-          {{ config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git
-        </td>
-        <td>
-          {{ config.get('GIT_URL_GIT') }}tickets/{{ repo.fullname }}.git
-        </td>
-      </tr>
-      {% endif %}
-      <tr class="extra_gits">
-        <td>Requests</td>
-        <td>:</td>
-        <td>
-          {{ config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git
-        </td>
-        <td>
-          {{ config.get('GIT_URL_GIT') }}requests/{{ repo.fullname }}.git
-        </td>
-      </tr>
-      {% endif %}
-    </table>
+
   </section>
 {% endif %}
 
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index c521a96..63c7cc2 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -12,34 +12,7 @@
             <a href="{{ url_for('view_repo', username=username, repo=repo.name)}}">
                 {{ repo.fullname }}
             </a>
-          {% if branchname %}
-            <div class="btn-group pull-right">
-              <button type="button" class="btn btn-info">{{ branchname }}</button>
-              <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <span class="sr-only">Toggle Dropdown</span>
-              </button>
-              <div class="dropdown-menu">
-                {% for branch in branches %}
-                  {% if origin == 'view_commits' %}
-                    <a class="dropdown-item" href="{{ url_for('view_commits',
-                                username=username, repo=repo.name, branchname=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% elif origin == 'view_repo_branch' %}
-                    <a class="dropdown-item" href="{{ url_for('view_repo_branch',
-                                username=username, repo=repo.name, branchname=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% elif origin == 'view_file' %}
-                    <a class="dropdown-item" href="{{ url_for('view_file',
-                                username=username, repo=repo.name, branchname=branch) }}">
-                      {{ branch }}
-                    </a>
-                  {% endif %}
-                {% endfor %}
-              </div>
-            </div>
-          {% endif %}
+
 
         </h2>
         <span id="projectinfo">
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 4c44622..3e301f6 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -12,156 +12,185 @@
 {% block repo %}
 
 <section class="settings">
-  <h2>Settings</h2>
+  <h3>Settings for {{repo.name}}</h3>
+  <div class="row">
+    <div class="col-md-8 col-md-offset-2">
+      <div class="card">
+        <div class="card-header">
+          Project Details
+        </div>
+        <div class="card-block">
+          <form action="{{ url_for('.update_project',
+                          username=username, repo=repo.name) }}" method="post">
+            <fieldset class="form-group">
+              <label for="description">Description</label>
+              <input class="form-control" name="description" value="{{ repo.description }}" required/>
+              <small class="text-muted">Short description of the project</small>
+            </fieldset>
+            <fieldset class="form-group">
+                <label for="url">Project's url</label>
+                <input class="form-control" name="url" value="{{ repo.url if repo.url else '' }}" />
+                <small class="text-muted">Website URL of the project</small>
+            </fieldset>
+            <fieldset class="form-group">
+              <label for="avatar">Avatar email</label>
+              <input class="form-control" name="avatar_email" value="{{ repo.avatar_email if repo.avatar_email else '' }}" />
+              <small class="text-muted">Email address linked to avatar to display for the project</small>
+            </fieldset>
+            <fieldset class="form-group">
+              <label for="tags">Project tags</label>
+              <input class="form-control" name="tags" value="{{ repo.tags_text |join(', ') if repo.tags else '' }}" />
+              <small class="text-muted">tags for project</small>
+            </fieldset>
+            <button class="btn btn-primary" type="submit" title="Update description">
+              Update
+            </button>
+            {{ form.csrf_token }}
+          </form>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-8 col-md-offset-2">
+      <div class="card">
+        <div class="card-header">
+          Default Branch
+        </div>
+        <div class="card-block">
+          <form action="{{ url_for('change_ref_head',
+                 username=username, repo=repo.name) }}" method="post">
+            {{ branches_form.csrf_token }}
+            {{ branches_form.branches(class_="c-select") }}
+            <input class="btn btn-primary" type="submit" value="Make Default"/>
+          </form>
+        </div>
+      </div>
+    </div>
+    <div class="col-md-8 col-md-offset-2">
+      <div class="card">
+        <div class="card-header">
+          <strong>Private web-hook key</strong>
+        </div>
+        <div class="card-block">
+          <p>
+            Each message sent to the web-hook are signed via hmac and SHA1 using
+            this private key.
+          </p>
+          <p>
+            This key is private to your project, make sure to store in a safe place
+            and do not share it.
+          </p>
+          <div class="form-group">
+            <div class="input-group">
+              <div class="input-group-addon"><span class="oi" data-glyph="key"></span></div>
+              <input class="form-control" type="text" value="{{ repo.hook_token }}" readonly>
+            </div>
+          </div>
 
-  <div>
-    <h3>Update project</h3>
-    <form action="{{ url_for('.update_project',
-                    username=username, repo=repo.name) }}" method="post">
-      <table>
-        <tr>
-          <td>
-            <label for="description">Description</label>
-          </td>
-          <td>
-            <input name="description" value="{{ repo.description }}" /> <br />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="url">Project's url</label>
-          </td>
-          <td>
-            <input name="url" value="{{ repo.url if repo.url else '' }}" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="avatar">Avatar email</label>
-          </td>
-          <td>
-            <input name="avatar_email" value="{{ repo.avatar_email if repo.avatar_email else '' }}" />
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <label for="tags">Project tags</label>
-          </td>
-          <td>
-            <input name="tags" value="{{ repo.tags_text |join(', ') if repo.tags else '' }}" />
-          </td>
-        </tr>
-      </table>
-      <button type="submit" title="Update description">
-        Update
-      </button>
-      {{ form.csrf_token }}
-    </form>
-  </div>
-  <div>
-    <h3> Default Branch </h3>
+          <form action="{{ url_for('.new_repo_hook_token',
+                        username=username, repo=repo.name) }}"
+              method="post" class="icon">
+          <button class="btn btn-primary" type="submit"
+            onclick="return confirm('Are you sure to generate a new token for '
+              + 'this project/fork? \nThis will break all web hook in place and '
+              + 'cannot be un-done.');"
+            title="Generate a new hook token">
+            <span class="oi" data-glyph="reload"></span> &nbsp;Re-generate
+          </button>
+          {{ form.csrf_token }}
+        </form>
+        </div>
+      </div>
+    </div>
 
-    <form action="{{ url_for('change_ref_head',
-                     username=username, repo=repo.name) }}" method="post">
-    {{ branches_form.csrf_token }}
-    {{ branches_form.branches }}
-    <input type="submit" value="Make Default"/>
-  </form>
-  </div>
+    <div class="col-md-8 col-md-offset-2">
+      <div class="card">
+        <div class="card-header">
+          <strong>API Keys</strong>
+        </div>
+        <div class="card-block">
+          <p>
+            API keys are tokens used to authenticate you on pagure. They can also
+            be used to grant access to 3rd party application to behave on this
+            project on your name.
+          </p>
+          <p>
+            These keys are valid for <span class="strong">60</span> days.
+          </p>
+          <p>
+            These keys are private to your project, make sure to store in a safe
+            place and do not share it.
+          </p>
+        </div>
+        {% if repo.tokens %}
+        <ul class="list-group list-group-flush">
+        {% for token in repo.tokens %}
+          {% if token.user.username == g.fas_user.username %}
+            <li class="list-group-item">
+              <div class="form-group">
+                <div class="input-group">
+                  <div class="input-group-addon"><span class="oi" data-glyph="key"></span></div>
+                  <input class="form-control" type="text" value="{{ token.id }}" readonly>
+                </div>
+              </div>
+            {% if token.expired %}
+              <span class="text-danger"><strong>Expired</strong> since {{ token.expiration.date() }}</span>
+            {% else %}
+              <span class="text-success"><strong>Valid</strong> until: {{ token.expiration.date() }}</span>
+              <form class="pull-right" action="{{ url_for('.revoke_api_token',
+                    username=username, repo=repo.name, token_id=token.id) }}"
+                method="post" class="icon">
+                <button class="btn btn-danger" type="submit"
+                    onclick="return confirm('Are you sure to revoke this token ?'
+                        + '\nThis will break all application using it and '
+                        + 'cannot be un-done.');"
+                    title="Revoke token">
+                  <span class="oi" data-glyph="trash"></span> &nbsp;Revoke
+                </button>
+                {{ form.csrf_token }}
+              </form>
+            {% endif %}
+              <button type="button" class="btn btn-link" data-toggle="modal" data-target="#acls{{ token.id }}">
+                ACLs
+              </button>
+              <div class="modal fade" id="acls{{ token.id }}" tabindex="-1" role="dialog" aria-labelledby="ACLs" aria-hidden="true">
+                <div class="modal-dialog" role="document">
+                  <div class="modal-content">
+                    <div class="modal-header">
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                        <span class="sr-only">Close</span>
+                      </button>
+                      <h4 class="modal-title" id="myModalLabel">ACLs</h4>
+                    </div>
+                    <div class="modal-body">
+                      {{ token.acls_list |safe }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </li>
+          {% endif %}
+        {% endfor %}
+        </ul>
+        {% endif %}
+        <div class="card-block">
+          <a href="{{ url_for('.add_token', username=username, repo=repo.name) }}"
+              method="post" class="icon">
+          <button class="btn btn-primary" type="submit"
+            title="Generate a new API token">
+            Create new key
+          </button>
+          </a>
+        </div>
+
+      </div>
+    </div>
 
-  {% if config.get('WEBHOOK') %}
-  <div>
-    <h3>Private web-hook key</h3>
-    <p>
-      Each message sent to the web-hook are signed via hmac and SHA1 using
-      this private key.
-    </p>
-    <p>
-      This key is private to your project, make sure to store in a safe place
-      and do not share it.
-    </p>
-    <pre>
-        {{ repo.hook_token }}
-    </pre>
-    <form action="{{ url_for('.new_repo_hook_token',
-                  username=username, repo=repo.name) }}"
-        method="post" class="icon">
-    <button class="icon_button" type="submit"
-      onclick="return confirm('Are you sure to generate a new token for '
-        + 'this project/fork? \nThis will break all web hook in place and '
-        + 'cannot be un-done.');"
-      title="Generate a new hook token">
-      <span class="icon icon-refresh blue"></span>
-      Re-generate
-    </button>
-    {{ form.csrf_token }}
-  </form>
   </div>
-  {% endif %}
+
 
   <div>
     <h3>API key</h3>
-    <p>
-      API keys are tokens used to authenticate you on pagure. They can also
-      be used to grant access to 3rd party application to behave on this
-      project on your name.
-    </p>
-    <p>
-      These keys are valid for <span class="strong">60</span> days.
-    </p>
-    <p>
-      These keys are private to your project, make sure to store in a safe
-      place and do not share it.
-    </p>
-
-    {% if repo.tokens %}
-    <table>
-    {% for token in repo.tokens %}
-      {% if token.user.username == g.fas_user.username %}
-      <tr>
-        <td>
-          {{ token.id }}
-        </td>
-        <td>
-        {% if token.expired %}
-          <span class="error">Expired</span> since {{ token.expiration.date() }}
-        {% else %}
-          <span class="message">Valid</span> until: {{ token.expiration.date() }}
-        {% endif %}
-        </td>
-        <td>
-          <a class="clickable"
-            onclick="show_acls({{ token.acls_list |safe }})">ACLs</a>
-        </td>
-        <td>
-          <form action="{{ url_for('.revoke_api_token',
-                username=username, repo=repo.name, token_id=token.id) }}"
-            method="post" class="icon">
-            <button class="icon_button" type="submit"
-                onclick="return confirm('Are you sure to revoke this token ?'
-                    + '\nThis will break all application using it and '
-                    + 'cannot be un-done.');"
-                title="Revoke token">
-              <span class="icon icon-trash blue"></span>
-              Revoke
-            </button>
-            {{ form.csrf_token }}
-          </form>
-        </td>
-      </tr>
-      {% endif %}
-    {% endfor %}
-    </table>
-    {% endif %}
-
-    <a href="{{ url_for('.add_token', username=username, repo=repo.name) }}"
-        method="post" class="icon">
-    <button class="icon_button" type="submit"
-      title="Generate a new API token">
-      <span class="icon icon-plus blue"></span>
-      Get a new Key
-    </button>
-    </a>
   </div>
 
 
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 99dc909..d5a61c1 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -139,6 +139,7 @@ def view_repo(repo, username=None):
         head=head,
         readme=readme,
         safe=safe,
+        origin='view_repo',
         branches=sorted(repo_obj.listall_branches()),
         branchname=branchname,
         last_commits=last_commits,