diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 682fd85..f6ad6e7 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -104,7 +104,7 @@
                   {{ pull_request.project_from.user.user }}/
                 {%- endif -%}
                 {{pull_request.project_from.name}}
-              {% endif %} 
+              {% endif %}
               </span>
             {% endif %}
             <a href="{{ url_for('ui_ns.view_tree',
@@ -114,7 +114,7 @@
                     namespace=repo.namespace,
                     branchname=pull_request.branch_from)
                   }}"
-                  class="badge badge-secondary badge-pill border border-secondary" 
+                  class="badge badge-secondary badge-pill border border-secondary"
                   style="font-size:1em">
                 <span class="fa fa-random"></span>
                 {{ pull_request.branch_from }}
@@ -127,7 +127,7 @@
                       namespace=repo.namespace,
                       branchname=pull_request.branch)
                       }}"
-                class="badge badge-secondary badge-pill border border-secondary" 
+                class="badge badge-secondary badge-pill border border-secondary"
                 style="font-size:1em">
               <i class="fa fa-random"></i>
             {{ pull_request.branch }}
@@ -154,7 +154,7 @@
                       {{ mergeform.csrf_token }}
                   </form>
                 {% endif %}
-      
+
               <form style="display:inline;" action="{{ url_for(
                   'ui_ns.cancel_request_pull', username=username,
                   namespace=repo.namespace,
@@ -216,8 +216,8 @@
             repo=repo.name, requestid=requestid) }}" method="POST">
       {{ mergeform.csrf_token }}
       <button type="submit" value="Reopen" id="reopen_pr"
-              class="btn btn-sm btn-primary" title="Reopen PR">
-        Re-Open
+              class="btn btn-sm btn-outline-danger" title="Reopen PR">
+        Reopen Pull Request 
       </button>
       </form>
    {% endif %}
@@ -997,37 +997,35 @@
     </a>
     {%- endmacro %}
     <div class="list-group list-group-flush">
-    {% set count = 0 %}
     {% for patch in diff %}
-        {% set count = count+1 %}
-            {% set linesadded = patch.line_stats[1] %}
-            {% set linesremoved = patch.line_stats[2] %}
+          {% set linesadded = patch.line_stats[1] %}
+          {% set linesremoved = patch.line_stats[2] %}
           {% if patch | hasattr('new_file_path') %}
             {%- if patch.new_file_path == patch.old_file_path -%}
               {%- if patch.status == 'D' -%}
-                {{ changesdeletedfile(patch.new_file_path, linesadded, linesremoved, count) }}
+                {{ changesdeletedfile(patch.new_file_path, linesadded, linesremoved, loop.index) }}
               {%-elif patch.status == 'A' -%}
-                {{ changesaddedfile(patch.new_file_path, linesadded, linesremoved, count) }}
+                {{ changesaddedfile(patch.new_file_path, linesadded, linesremoved, loop.index) }}
               {%-elif patch.status == 'M' -%}
-                {{ changeschangedfile(patch.new_file_path, linesadded, linesremoved, count) }}
+                {{ changeschangedfile(patch.new_file_path, linesadded, linesremoved, loop.index) }}
               {%-endif-%}
             {%- else -%}
-              {{changesrenamedfile(patch.old_file_path, patch.new_file_path, linesadded, linesremoved, count)}}
+              {{changesrenamedfile(patch.old_file_path, patch.new_file_path, linesadded, linesremoved, loop.index)}}
             {%- endif -%}
           {%- elif patch | hasattr('delta') -%}
             {%- if patch.delta.new_file.path == patch.delta.old_file.path -%}
               {%- if patch.delta.new_file.mode == 0
                   and patch.delta.old_file.mode in [33188, 33261] -%}
-                {{ changesdeletedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
+                {{ changesdeletedfile(patch.delta.new_file.path, linesadded, linesremoved, loop.index) }}
               {%-elif patch.delta.new_file.mode in [33188, 33261]
                    and patch.delta.old_file.mode == 0 -%}
-                {{ changesaddedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
+                {{ changesaddedfile(patch.delta.new_file.path, linesadded, linesremoved, loop.index) }}
               {%-elif patch.delta.new_file.mode in [33188, 33261]
                    and patch.delta.old_file.mode in [33188, 33261] -%}
-                {{ changeschangedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
+                {{ changeschangedfile(patch.delta.new_file.path, linesadded, linesremoved, loop.index) }}
               {%-endif-%}
             {%- else -%}
-              {{changesrenamedfile(patch.delta.old_file.path, patch.delta.new_file.path, linesadded, linesremoved, count)}}
+              {{changesrenamedfile(patch.delta.old_file.path, patch.delta.new_file.path, linesadded, linesremoved, loop.index)}}
             {%- endif -%}
           {%- endif -%}
     {% endfor %}
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 1343808..c3e3a14 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -798,8 +798,8 @@ def reopen_request_pull(repo, requestid, username=None, namespace=None):
         flask.flash('Invalid input submitted', 'error')
 
     return flask.redirect(flask.url_for(
-        'ui_ns.request_pull', repo=repo, username=username, namespace=namespace,
-        requestid=requestid))
+        'ui_ns.request_pull', repo=repo, username=username,
+        namespace=namespace, requestid=requestid))
 
 
 @UI_NS.route(
diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py
index be139dd..c5797c7 100644
--- a/tests/test_pagure_flask_ui_fork.py
+++ b/tests/test_pagure_flask_ui_fork.py
@@ -383,7 +383,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -407,7 +407,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -432,7 +432,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -572,7 +572,7 @@ class PagureFlaskForktests(tests.Modeltests):
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -778,7 +778,7 @@ class PagureFlaskForktests(tests.Modeltests):
         self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1624,7 +1624,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1653,7 +1653,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1678,7 +1678,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1712,7 +1712,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1781,7 +1781,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1806,7 +1806,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -1856,7 +1856,7 @@ index 0000000..2a552bb
 
             self.assertIn('Pull-request **un**tagged with: black', output.get_data(as_text=True))
             self.assertIn('Pull-request tagged with: blue, yellow', output.get_data(as_text=True))
-            
+
 
         user.username = 'pingou'
         with tests.user_set(self.app.application, user):
@@ -2736,7 +2736,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
@@ -2774,7 +2774,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -2835,7 +2835,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
@@ -2871,17 +2871,17 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n',
                 output_text)
             # Checking if Edited by User is there or not
             self.assertTrue(
-                '<small class="text-muted">Edited just now by pingou </small>'
+                '<small class="text-semimuted">Edited just now by pingou </small>'
                 in output_text
                 or
-                '<small class="text-muted">Edited seconds ago by pingou </small>'
+                '<small class="text-semimuted">Edited seconds ago by pingou </small>'
                 in output_text)
             self.assertIn(
                 '</button>\n                      Comment updated', output_text)
@@ -2926,7 +2926,7 @@ index 0000000..2a552bb
             self.assertIn(
                 '<h4 class="ml-1">\n        <div>\n              '
                 '<span class="fa fa-fw text-success fa-arrow-circle-down pt-1"></span>\n              '
-                '<span class="text-success ' 
+                '<span class="text-success '
                 'font-weight-bold">#1</span>\n            '
                 '<span class="font-weight-bold">\n                  '
                 'PR from the feature branch\n', output_text)
diff --git a/tests/test_pagure_flask_ui_remote_pr.py b/tests/test_pagure_flask_ui_remote_pr.py
index 89493cc..dc44885 100644
--- a/tests/test_pagure_flask_ui_remote_pr.py
+++ b/tests/test_pagure_flask_ui_remote_pr.py
@@ -262,9 +262,15 @@ class PagureRemotePRtests(tests.Modeltests):
                 output_text)
             # Show the filename in the Changes summary
             self.assertIn(
-                '<a href="#_1">.gitignore</a>', output_text)
+                '<a href="#_1" class="list-group-item', output_text)
             self.assertIn(
-                '<a href="#_1">sources</a>', output_text)
+                '<div class="ellipsis pr-changes-description">'
+                '\n          <small>.gitignore</small>', output_text)
+            self.assertIn(
+                '<a href="#_2" class="list-group-item', output_text)
+            self.assertIn(
+                '<div class="ellipsis pr-changes-description">'
+                '\n          <small>sources</small>', output_text)
 
         # Remote PR Created
         self.session = pagure.lib.create_session(self.dbpath)