diff --git a/pagure/templates/_render_issues.html b/pagure/templates/_render_issues.html
index 1b431bd..a7ae946 100644
--- a/pagure/templates/_render_issues.html
+++ b/pagure/templates/_render_issues.html
@@ -1,14 +1,15 @@
-{% macro render_issue_row(issue, repo, username, subtitle=True) %}
+{% macro render_issue_row(issue, repo, username, subtitle=True, class="", showproject=False) %}
     {% if issue.status == 'Open' %}
         {% set status_color = "success" %}
     {% else %}
         {% set status_color = "danger" %}
     {% endif %}
 
-<div class="issuerow list-group-item list-group-item-action">
+<div class="issuerow list-group-item list-group-item-action {{class}}">
         <div class="d-flex align-items-start">
             <span class="fa fa-fw text-{{status_color}} fa-exclamation-circle pt-1"></span>
-            <div class="ml-1">
+            <div class="w-100">
+            <div class="ml-1 d-flex">
                 <div>
                     <span class="text-{{status_color}} font-weight-bold">#{{issue.id}}</span>
                     <span class="font-weight-bold">
@@ -24,8 +25,30 @@
                     <span title="Private ticket" class="text-danger fa fa-fw fa-lock"></span>
                     {% endif %}
                 </div>
+                <div class="ml-auto nowrap">
+                    <span class="font-weight-bold text-muted ml-auto">
+                    {% if issue.priority is not none  %}
+                    <span title="Priority" class="mr-3"><i class="fa fa-fw fa-bolt"></i>{{ repo.priorities[issue.priority | string] }}</span>
+                    {% endif %}
+
+                    {% if issue.assignee %}
+                    <span title="{{ issue.assignee.username}}" class="mr-3 assigned-user">
+                        <i class="fa fa-fw fa-user-plus pr-2"></i>
+                        {{ issue.assignee.username | avatar(size=20) | safe}}
+                    </span>
+                    {% endif %}
+
+                    {% if issue.user_comments|count > 0 %}
+                    <span title="Comments on the ticket" class="text-muted">
+                    <span class="fa fa-fw fa-comment pr-2"></span>
+                        {{issue.user_comments|count}}
+                    </span>
+                    {% endif %}
+                    </span>
+                </div>
+            </div>
                 {% if subtitle %}
-                <div>
+                <div class="d-flex">
                     <small>Opened <a href="#" data-toggle="tooltip" title="{{
                         issue.date_created | format_datetime
                       }}">{{ issue.date_created | humanize}}</a> by <span title="{{
@@ -34,6 +57,40 @@
                         issue.last_updated | format_datetime
                       }}">{{ issue.last_updated | humanize}}</span>
                       </small>
+                      {% if showproject %}
+                      <small class="ml-auto mt-1">
+                            {% if repo.is_fork -%}
+                            <i class="fa fa-code-fork text-muted"></i>&nbsp;
+                            {%- else -%}
+                            <i class="fa fa-calendar-o fa-rotate-270 text-muted"></i> &nbsp;
+                            {%- endif -%}
+                          {% if repo.is_fork %}
+                          <a href="{{ url_for(
+                              'ui_ns.view_user', username=repo.user.user)
+                              }}">{{ repo.user.user }}</a><span class="mt-1 text-muted"> / </span>
+                          {% endif %}
+                          {% if repo.namespace %}
+                              <a href="{{ url_for(
+                                  'ui_ns.view_projects', namespace=repo.namespace, pattern='*')
+                              }}">{{ repo.namespace }}</a>/
+                          {% endif %}
+                          {% if repo.is_fork %}
+                          <a href="{{ url_for('ui_ns.view_repo',
+                              repo=repo.name,
+                              username=repo.user.username,
+                              namespace=repo.namespace)
+                              }}">
+                        {% else %}
+                        <a href="{{ url_for('ui_ns.view_repo',
+                        repo=repo.name,
+                        username=None,
+                        namespace=repo.namespace)
+                        }}">
+                        {% endif %}
+                            
+                            <strong>{{ repo.name }}</strong></a>
+                      </small>
+                      {% endif %}
                 </div>
                 <div>
                         {% for tag in issue.tags %}
@@ -50,26 +107,7 @@
                         {% endfor %}
                 </div>
                 {% endif %}
-            </div>
-            <span class="font-weight-bold text-muted ml-auto">
-            {% if issue.priority is not none  %}
-            <span title="Priority" class="mr-3"><i class="fa fa-fw fa-bolt"></i>{{ repo.priorities[issue.priority | string] }}</span>
-            {% endif %}
-
-            {% if issue.assignee %}
-            <span title="{{ issue.assignee.username}}" class="mr-3 assigned-user">
-                <i class="fa fa-fw fa-user-plus pr-2"></i>
-                {{ issue.assignee.username | avatar(size=20) | safe}}
-            </span>
-            {% endif %}
-
-            {% if issue.user_comments|count > 0 %}
-            <span title="Comments on the ticket" class="text-muted">
-              <span class="fa fa-fw fa-comment pr-2"></span>
-                {{issue.user_comments|count}}
-            </span>
-            {% endif %}
-            </span>
+                </div>
         </div>
     </div><!-- end issuerow -->
 {% endmacro%}
diff --git a/pagure/templates/user_issues.html b/pagure/templates/user_issues.html
deleted file mode 100644
index a8a29f0..0000000
--- a/pagure/templates/user_issues.html
+++ /dev/null
@@ -1,145 +0,0 @@
-{% extends "master.html" %}
-
-{% block title %}Issues for {{ username }}{% endblock %}
-
-
-{% block content %}
-<div class="p-t-2">
-  <div class="container">
-    <h3 class="p-b-2">
-        Issues for {{ username | avatar(20) | safe }} {{ username }}
-    </h3>
-    <div>
-      <span class="btn-group btn-group-sm issues-tagbar" role="group">
-          <a data-togglebutton="issue-status-open" id="toggle-open" class="btn btn-primary btn-sm" href="#">Open</a>
-          <a data-togglebutton="issue-status-closed" id="toggle-closed" class="btn btn-secondary btn-sm" href="#">Closed</a>
-          <a data-togglebutton="issue-status-all" class="btn btn-secondary btn-sm" href="#">All</a>
-      </span>
-    </div>
-    <hr>
-
-    {% for issues in (user.assigned_issues, user.issues) %}
-      {% set outer_loop = loop %}
-      {% if outer_loop.index == 1 %}
-        <b>Assigned Issues <span id="assigned_issue_count"></span></b>
-      {% else %}
-        <b>Opened Issues <span id="opened_issue_count"></span></b>
-      {% endif %}
-      <table class="table table-hover table-striped m-b-0 m-t-1">
-        <thead class="thead-default">
-            <tr>
-                <th class="nowrap">#</th>
-                <th>Status</th>
-                <th>Title</th>
-                <th class="open_date nowrap">Opened</th>
-                <th class="open_date nowrap">Modified</th>
-                <th class="nowrap">Priority</th>
-                <th class="nowrap">Project</th>
-                <th class="assigned nowrap">Created by</th>
-                <th class="assigned nowrap">Assigned to</th>
-            </tr>
-        </thead>
-        <tfoot>
-        </tfoot>
-        <tbody>
-        {% for issue in issues if issue.project.settings.get('issue_tracker', True) %}
-          <tr class="issue-status issue-status-{{issue.status|lower}} loop-index-{{outer_loop.index}}"
-              {%- if issue.status|lower != "open" %} style="display:none;"{% endif %}>
-                <td class="nowrap"><span class="label label-default">#{{ issue.id }}</span></td>
-                <td><span class="label {%
-                    if issue.status|lower == 'closed' %}label-danger{%
-                    elif issue.status|lower == 'open'%}label-primary{%
-                    else %}label-default{%
-                    endif%}">{{issue.status}}</span></td>
-                <td class="stretch-table-column">
-                  <a href="{{ url_for(
-                      'ui_ns.view_issue',
-                      repo=issue.project.name,
-                      username=issue.project.user.username if issue.project.is_fork else None,
-                      namespace=issue.project.namespace,
-                      issueid=issue.id) }}">
-                    {% if issue.private %}
-                        Private Issue
-                    {% else %}
-                        {{ issue.title | noJS("img") | safe }}
-                    {% endif %}
-                  </a>
-                </td>
-                <td class="nowrap">
-                    <span title="{{issue.date_created | format_datetime}}">{{
-                        issue.date_created | humanize}}</span>
-                </td>
-                <td class="nowrap">
-                    <span title="{{issue.last_updated | format_datetime}}">{{
-                        issue.last_updated | humanize}}</span>
-                </td>
-                <td>
-                    {{ issue.project.priorities[issue.priority | string] or '' }}
-                </td>
-                <td class="nowrap">
-                  <a href="{{ url_for(
-                    'ui_ns.view_repo',
-                    repo=issue.project.name,
-                    username=issue.project.user.username if issue.project.is_fork else None,
-                    namespace=issue.project.namespace) }}">
-                    {{ issue.project.user.username + '/' if issue.project.is_fork }}
-                    {{ issue.project.namespace + '/' if issue.project.namespace }}
-                    {{ issue.project.name }}
-                  </a>
-                </td>
-                <td class="nowrap">
-                  {{ issue.user.default_email | avatar(16) | safe }}
-                  {{ issue.user.user }}
-                </td>
-                <td class="nowrap">
-                  {% if issue.assignee %}
-                  {{ issue.assignee.default_email | avatar(16) | safe }}
-                  {{ issue.assignee.user }}
-                  {% else %}
-                  <span class="text-muted">unassigned</span>
-                  {% endif %}
-                </td>
-            </tr>
-        {% else %}
-            <tr>
-                <td colspan="9" class="noresult">No issues found</td>
-            </tr>
-        {% endfor %}
-        </tbody>
-      </table>
-      <br>
-    {% endfor %}
-  </div>
-</div>
-
-{% endblock %}
-
-{% block jscripts %}
-    {{ super() }}
-    <script type="text/javascript">
-      count_issues(status='.issue-status-open');
-      $(function(){
-        $('.issues-tagbar .btn').click(function(){
-          var current_btn = $(this).attr("data-togglebutton");
-          count_issues(status='.'+current_btn);
-          $('.issues-tagbar .btn-primary').addClass("btn-secondary");
-          $('.issues-tagbar .btn-primary').removeClass("btn-primary");
-          $(this).removeClass("btn-secondary");
-          $(this).addClass("btn-primary");
-          if (current_btn == "issue-status-all"){
-            count_issues(status='');
-            $(".issue-status").show();
-          } else {
-            $(".issue-status").hide();
-            $("."+$(this).attr("data-togglebutton")).show();
-          }
-        });
-      });
-      function count_issues(status='.issue-status-open') {
-        var assigned_issue_count = $(status + '.loop-index-1').length;
-        var opened_issue_count = $(status + '.loop-index-2').length;
-        $('#assigned_issue_count').text(assigned_issue_count);
-        $('#opened_issue_count').text(opened_issue_count);
-      }
-    </script>
-{% endblock %}
diff --git a/pagure/templates/userprofile_issues.html b/pagure/templates/userprofile_issues.html
new file mode 100644
index 0000000..028aa69
--- /dev/null
+++ b/pagure/templates/userprofile_issues.html
@@ -0,0 +1,87 @@
+{% extends "userprofile_master.html" %}
+
+{% block title %}Issues for {{ username }}{% endblock %}
+
+{% from "_render_issues.html" import render_issue_row %}
+
+
+{% block userprofile_content %}
+<div class="pt-4">
+  <div class="container">
+    <div class="d-flex align-items-center">
+    <h4 class="mb-0 font-weight-bold">
+        Issues for {{ username | avatar(20) | safe }} {{ username }}
+    </h4>
+    <div class="ml-auto">
+      <span class="btn-group btn-group-sm issues-tagbar" role="group">
+          <a data-togglebutton="issue-status-open" id="toggle-open" class="btn btn-primary btn-sm" href="#">Open</a>
+          <a data-togglebutton="issue-status-closed" id="toggle-closed" class="btn btn-outline-primary btn-sm" href="#">Closed</a>
+          <a data-togglebutton="issue-status-all" class="btn btn-outline-primary btn-sm" href="#">All</a>
+      </span>
+    </div>
+    </div>
+    <div class="d-flex mt-4 mb-2 align-items-center">
+      <h5 class="font-weight-bold mb-0">Issues Created</h5>
+      <span class="ml-auto btn btn-outline-secondary border-0 o-100 disabled font-weight-bold">
+        <span id="opened_issue_count"></span> issues
+      </span>
+    </div>
+    {% for issue in user.issues if issue.project.settings.get('issue_tracker', True) %}
+      {% if issue.status|lower != "open" %}
+        {% set hidden = "hidden "%}
+      {% else %}
+        {% set hidden = "" %}
+      {% endif %}
+      {% set htmlclass = hidden+"loop-index-2 issue-status issue-status-"+issue.status|lower%}
+      {{render_issue_row(issue, issue.project, username, class=htmlclass, showproject=True)}}
+    {% endfor %}
+
+    <div class="d-flex mt-4 mb-2 align-items-center">
+      <h5 class="font-weight-bold mb-0">Assigned Issues</h5>
+      <span class="ml-auto btn btn-outline-secondary border-0 o-100 disabled font-weight-bold">
+        <span id="assigned_issue_count"></span> issues
+      </span>
+    </div>
+    {% for issue in user.assigned_issues if issue.project.settings.get('issue_tracker', True) %}
+      {% if issue.status|lower != "open" %}
+        {% set hidden = "hidden "%}
+      {% else %}
+        {% set hidden = "" %}
+      {% endif %}
+      {% set htmlclass = hidden+"loop-index-1 issue-status issue-status-"+issue.status|lower%}
+      {{render_issue_row(issue, issue.project, username, class=htmlclass, showproject=True)}}
+    {% endfor %}
+  </div>
+</div>
+
+{% endblock %}
+
+{% block jscripts %}
+    {{ super() }}
+    <script type="text/javascript">
+      count_issues(status='.issue-status-open');
+      $(function(){
+        $('.issues-tagbar .btn').click(function(){
+          var current_btn = $(this).attr("data-togglebutton");
+          count_issues(status='.'+current_btn);
+          $('.issues-tagbar .btn-primary').addClass("btn-outline-primary");
+          $('.issues-tagbar .btn-primary').removeClass("btn-primary");
+          $(this).removeClass("btn-outline-primary");
+          $(this).addClass("btn-primary");
+          if (current_btn == "issue-status-all"){
+            count_issues(status='');
+            $(".issue-status").show();
+          } else {
+            $(".issue-status").hide();
+            $("."+$(this).attr("data-togglebutton")).show();
+          }
+        });
+      });
+      function count_issues(status='.issue-status-open') {
+        var assigned_issue_count = $(status + '.loop-index-1').length;
+        var opened_issue_count = $(status + '.loop-index-2').length;
+        $('#assigned_issue_count').text(assigned_issue_count);
+        $('#opened_issue_count').text(opened_issue_count);
+      }
+    </script>
+{% endblock %}
diff --git a/pagure/templates/userprofile_master.html b/pagure/templates/userprofile_master.html
index 64921f9..a254b56 100644
--- a/pagure/templates/userprofile_master.html
+++ b/pagure/templates/userprofile_master.html
@@ -95,6 +95,15 @@
               </div>
             </a>
           </li>
+          <li class="nav-item text-dark">
+              <a class="nav-link d-flex align-items-center {{'active' if select=='issues'}}"
+                href="{{ url_for('ui_ns.view_user_issues', username=user.username) }}">
+                <span>
+                  <i class="fa fa-fw text-muted fa-exclamation-circle"></i>
+                  <span class="d-none d-md-inline">Issues&nbsp;</span>
+                </span>
+              </a>
+            </li>
         </ul>
     </div>
 
diff --git a/pagure/ui/app.py b/pagure/ui/app.py
index 81a0a70..96ba9f0 100644
--- a/pagure/ui/app.py
+++ b/pagure/ui/app.py
@@ -910,9 +910,15 @@ def view_user_issues(username):
         flask.abort(404, "Tickets have been disabled on this pagure instance")
 
     user = _get_user(username=username)
+    userprofile_common = get_userprofile_common(user)
 
     return flask.render_template(
-        "user_issues.html", username=username, user=user
+        "userprofile_issues.html",
+        username=username,
+        user=user,
+        repos_length=userprofile_common["repos_length"],
+        forks_length=userprofile_common["forks_length"],
+        select='issues',
     )