diff --git a/pagure/__init__.py b/pagure/__init__.py
index 22431e9..c0af24a 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -347,9 +347,10 @@ def inject_variables():
         watch = False
         if authenticated():
             watch = pagure.lib.is_watching(
-                SESSION, flask.g.fas_user, reponame,
-                namespace=namespace,
-                repouser=username)
+                SESSION, flask.g.fas_user,
+                reponame,
+                repouser=username,
+                namespace=namespace)
         return watch
 
     return dict(
diff --git a/pagure/hooks/files/pagure_hook.py b/pagure/hooks/files/pagure_hook.py
index 7cb91cc..b56071a 100755
--- a/pagure/hooks/files/pagure_hook.py
+++ b/pagure/hooks/files/pagure_hook.py
@@ -40,8 +40,8 @@ def generate_revision_change_log(new_commits_list):
         for relation in pagure.lib.link.get_relation(
                 pagure.SESSION,
                 pagure.lib.git.get_repo_name(abspath),
-                pagure.lib.git.get_repo_namespace(abspath),
                 pagure.lib.git.get_username(abspath),
+                pagure.lib.git.get_repo_namespace(abspath),
                 line,
                 'fixes',
                 include_prs=True):
@@ -51,8 +51,8 @@ def generate_revision_change_log(new_commits_list):
         for issue in pagure.lib.link.get_relation(
                 pagure.SESSION,
                 pagure.lib.git.get_repo_name(abspath),
-                pagure.lib.git.get_repo_namespace(abspath),
                 pagure.lib.git.get_username(abspath),
+                pagure.lib.git.get_repo_namespace(abspath),
                 line,
                 'relates'):
             relates_commit(commitid, issue, pagure.APP.config.get('APP_URL'))
diff --git a/pagure/lib/link.py b/pagure/lib/link.py
index c4c3b24..f1f87e1 100644
--- a/pagure/lib/link.py
+++ b/pagure/lib/link.py
@@ -40,7 +40,7 @@ RELATES = [
 ]
 
 
-def get_relation(session, reponame, namespace, username, text,
+def get_relation(session, reponame, username, namespace, text,
                  reftype='relates', include_prs=False):
     ''' For a given text, searches using regex if the text contains
     reference to another issue in this project or another one.
diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index a743541..886d65b 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -189,8 +189,11 @@
       {% if g.repo_admin or (
         g.fas_user and g.fas_user.username == comment.user.username) %}
       <a class="btn btn-primary btn-sm" href="{{
-          url_for('edit_issue', username=username,
-                  repo=repo.name, issueid=issueid)
+          url_for('edit_issue',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  issueid=issueid)
           }}" title="Edit this issue">
       <span class="oi" data-glyph="pencil"></span></a>
       {% endif %}
diff --git a/pagure/templates/_render_repo.html b/pagure/templates/_render_repo.html
index aec99c6..cb01766 100644
--- a/pagure/templates/_render_repo.html
+++ b/pagure/templates/_render_repo.html
@@ -148,8 +148,9 @@
                 <a class="project_link logo_link" href="{{
                     url_for(
                     'view_repo',
+                    repo=repo.name,
                     username=repo.user.username if repo.is_fork else None,
-                    repo=repo.name, namespace=repo.namespace)
+                    namespace=repo.namespace)
                 }}">
                   <div>
                     <strong>
@@ -224,8 +225,9 @@
             {% for repo in list %}
               <div class="list-group-item">
                 {% set url = url_for('view_repo',
+                  repo=repo.name,
                   username=repo.user.username if repo.is_fork else None,
-                  repo=repo.name, namespace=repo.namespace) %}
+                  namespace=repo.namespace) %}
 
                 {% if repo.avatar_email %}
                   <img class="projecticon pull-xs-left"
diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html
index e4ca68a..5ce976f 100644
--- a/pagure/templates/commit.html
+++ b/pagure/templates/commit.html
@@ -13,18 +13,27 @@
     <span>{{ splitted_message[0] }}</span>
     <div class="pull-xs-right btn-group">
       <a class="btn btn-secondary btn-sm" href="{{ url_for(
-        'view_raw_file', username=username, namespace=repo.namespace,
-        repo=repo.name, identifier=commitid) }}" title="View as raw">raw</a>
+        'view_raw_file',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        identifier=commitid) }}" title="View as raw">raw</a>
       <a class="btn btn-secondary btn-sm" href="{{ url_for(
-        'view_commit_patch', username=username, namespace=repo.namespace,
-        repo=repo.name, commitid=commitid) }}">patch</a>
+        'view_commit_patch',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        commitid=commitid) }}">patch</a>
       <a class="btn btn-secondary btn-sm" href="{{ url_for(
         'view_tree', username=username, namespace=repo.namespace,
         repo=repo.name, identifier=commitid) }}">tree</a>
       {% if commit.parents|length == 1 %}
       <a class="btn btn-secondary btn-sm" title={{commit.parents[0].oid.hex}} href="{{ url_for(
-        'view_commit', username=username, namespace=repo.namespace,
-        repo=repo.name, commitid=commit.parents[0].oid.hex) }}">parent</a>
+        'view_commit',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        commitid=commit.parents[0].oid.hex) }}">parent</a>
       {% elif commit.parents|length > 1 %}
       <div class="btn-group" role="group">
         <button id="parentsDrop" type="button" class="btn btn-secondary btn-sm dropdown-toggle"
@@ -34,8 +43,11 @@
         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="parentsDrop">
           {% for parent in commit.parents %}
             <a class="dropdown-item" href="{{ url_for(
-                'view_commit', username=username, namespace=repo.namespace,
-                repo=repo.name, commitid=parent.oid.hex)
+                'view_commit',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                commitid=parent.oid.hex)
             }}" class="commitid">{{parent.oid.hex}}</a>
           {% endfor %}
         </div>
@@ -175,9 +187,9 @@
         url: '{{ url_for("internal_ns.get_branches_of_commit") }}' ,
         type: 'POST',
         data: {
-          namespace: "{{ repo.namespace }}",
           repo: "{{ repo.name }}",
           repouser: "{{ repo.user.user if repo.is_fork else '' }}",
+          namespace: "{{ repo.namespace }}",
           commit_id: "{{ commitid }}",
           csrf_token: "{{ form.csrf_token.current_token }}",
         },
diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html
index 0839c5a..4897362 100644
--- a/pagure/templates/commits.html
+++ b/pagure/templates/commits.html
@@ -40,8 +40,11 @@
           <div class="dropdown-menu dropdown-menu-right">
             {% for branch in g.branches %}
                 <a class="dropdown-item" href="{{ url_for(
-                    'view_commits', namespace=repo.namespace,
-                    username=username, repo=repo.name, branchname=branch) }}">
+                    'view_commits',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    branchname=branch) }}">
                   {{ branch }}
                 </a>
             {% endfor %}
@@ -75,7 +78,9 @@
           <div id="request_pull" class="pull-xs-right">
             <a class="btn btn-primary btn-sm"
               href="{{ url_for('new_request_pull',
-                    username=username, repo=repo.name, namespace=repo.namespace,
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
                     branch_to=head, branch_from=branchname or 'master') }}">
               {% if g.repo_admin %}Request pull{% else %}Compare{% endif %}
             </a>
@@ -84,9 +89,11 @@
 
       <div id="diff_commits" class="list-group m-t-1" style="display:none;">
         {% for diff_commit_full in diff_commits_full %}
-           <a href="{{ url_for('view_commit', username=username,
+           <a href="{{ url_for('view_commit',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, commitid=diff_commit_full.hex)
+                    commitid=diff_commit_full.hex)
               }}" class="list-group-item">
               <h5>
                 <strong>{{ diff_commit_full.message.split('\n')[0] }}</strong>
@@ -112,9 +119,11 @@
 
       <div class="list-group m-t-1">
         {% for commit in last_commits %}
-          <a href="{{ url_for('view_commit', username=username,
+          <a href="{{ url_for('view_commit',
+                repo=repo.name,
+                username=username,
                 namespace=repo.namespace,
-                repo=repo.name, commitid=commit.hex, branch=branchname) }}"
+                commitid=commit.hex, branch=branchname) }}"
               class="list-group-item {%
                 if diff_commits and commit.oid.hex in diff_commits %}p-l-3{%
                 endif %}" style="position:relative;">
@@ -147,9 +156,12 @@
         <nav class="text-center">
           <ul class="pagination">
             <li {% if page <= 1%} class="disabled" {% endif %}>
-              <a href="{{ url_for('.%s' % origin, username=username,
+              <a href="{{ url_for('.%s' % origin,
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, branchname=branchname, page=page-1)
+                    branchname=branchname,
+                    page=page-1)
                 }}" aria-label="Previous">
                 <span aria-hidden="true">&laquo;</span>
                 <span class="sr-only">Newer</span>
@@ -157,9 +169,12 @@
             </li>
             <li class="active">page {{ page }} of {{total_page}}</li>
             <li {% if page >= total_page %}class="disabled"{%endif%}>
-              <a href="{{ url_for('.%s' % origin, username=username,
+              <a href="{{ url_for('.%s' % origin,
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, branchname=branchname, page=page+1)
+                    branchname=branchname,
+                    page=page+1)
                 }}" aria-label="Next">
                 <span aria-hidden="true">&raquo;</span>
                 <span class="sr-only">Older</span>
diff --git a/pagure/templates/docs.html b/pagure/templates/docs.html
index 9579553..9dd3453 100644
--- a/pagure/templates/docs.html
+++ b/pagure/templates/docs.html
@@ -8,8 +8,10 @@
 {% block repo %}
 
 <iframe id="docframe" src="{{ config['DOC_APP_URL'] + url_for('.view_repo',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, filename=filename) }}"
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        filename=filename) }}"
     frameborder="0" style="min-height:700px;width:100%"
     onload="resize_iframe()">
   <p>Your browser does not support iframe, please visit
diff --git a/pagure/templates/edit_file.html b/pagure/templates/edit_file.html
index d1c7dfe..85f8b8c 100644
--- a/pagure/templates/edit_file.html
+++ b/pagure/templates/edit_file.html
@@ -14,8 +14,11 @@
 <div class="card">
   <div class="card-header">
       <ol class="breadcrumb">
-      <li><a href="{{ url_for('view_tree', username=username,
-            namespace=repo.namespace, repo=repo.name, identifier=branchname)
+      <li><a href="{{ url_for('view_tree',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            identifier=branchname)
       }}"><span class="oi" data-glyph="random"></span>&nbsp; {{ branchname }}</a></li>{%
     for file in filename.split('/') %}
       {% if loop.first %}
@@ -25,8 +28,10 @@
       {% endif %}
       {% if loop.index != loop.length %}<li><a
       href="{{ url_for('view_file',
-            username=username, namespace=repo.namespace,
-            repo=repo.name, identifier=branchname,
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            identifier=branchname,
             filename=path)}}"
         ><span class="oi" data-glyph="folder"></span>&nbsp; {{ file }}</a>
         </li>{%
@@ -41,8 +46,11 @@
   </div>
   <div class="card-block p-a-0">
     <form action="{{ url_for(
-          'edit_file', username=username, namespace=repo.namespace,
-          repo=repo.name, branchname=branchname, filename=filename) }}"
+          'edit_file',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          branchname=branchname, filename=filename) }}"
           method="post">
     {{ form.csrf_token }}
 
diff --git a/pagure/templates/edit_tag.html b/pagure/templates/edit_tag.html
index 8ebb415..254fbcf 100644
--- a/pagure/templates/edit_tag.html
+++ b/pagure/templates/edit_tag.html
@@ -11,8 +11,11 @@
 <h2>Edit tag: {{ edit_tag }}</h2>
 
 <section class="edit_tag">
-    <form action="{{ url_for('.edit_tag', namespace=repo.namespace,
-                     username=username, repo=repo.name, tag=edit_tag) }}" method="post">
+    <form action="{{ url_for('.edit_tag',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    tag=edit_tag) }}" method="post">
 
     <p>Enter in the field below the new name for the tag: "{{ edit_tag }}"</p>
     <table>
diff --git a/pagure/templates/file.html b/pagure/templates/file.html
index 7892d53..11eaf18 100644
--- a/pagure/templates/file.html
+++ b/pagure/templates/file.html
@@ -34,14 +34,20 @@
             {% for branch in g.branches %}
               {% if origin == 'view_tree' %}
                 <a class="dropdown-item" href="{{ url_for(
-                    'view_tree', namespace=repo.namespace,
-                    username=username, repo=repo.name, identifier=branch) }}">
+                    'view_tree',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branch) }}">
                   {{ branch }}
                 </a>
               {% elif origin == 'view_file' %}
                 <a class="dropdown-item" href="{{ url_for(
-                    'view_file', namespace=repo.namespace,
-                    username=username, repo=repo.name, identifier=branch,
+                    'view_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branch,
                     filename=filename | unicode ) }}">
                   {{ branch }}
                 </a>
@@ -57,8 +63,11 @@
       <div class="card-header">
         <ol class="breadcrumb">
           <li>
-            <a href="{{ url_for('view_tree', namespace=repo.namespace,
-                username=username, repo=repo.name, identifier=branchname)
+            <a href="{{ url_for('view_tree',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                identifier=branchname)
           }}">
               <span class="oi" data-glyph="random">
               </span>&nbsp; {{ branchname }}
@@ -71,9 +80,12 @@
           {% set path = path + '/' + file %}
           {% endif %}
           {% if loop.index != loop.length %}<li><a
-          href="{{ url_for('view_file', username=username,
-            namespace=repo.namespace, repo=repo.name, identifier=branchname,
-            filename=path | unicode)}}">
+          href="{{ url_for('view_file',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                identifier=branchname,
+                filename=path | unicode)}}">
             <span class="oi" data-glyph="folder"></span>&nbsp; {{ file }}</a>
           </li>
           {% elif file %}
@@ -94,15 +106,20 @@
             <div class="file-button-bar">
                 {% if output_type in ('file','markup') and g.repo_admin %}
                 <a class="btn btn-sm btn-secondary" href="{{ url_for(
-                    'edit_file', username=username, namespace=repo.namespace,
-                    repo=repo.name, branchname=branchname,
+                    'edit_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    branchname=branchname,
                     filename=filename | unicode) }}" title="Edit file">Edit</a>
                 {% endif %}
                 {% if output_type in ('file','markup') %}
                 <form class="btn btn-sm" method="POST" name="fork_project"
-                    action="{{ url_for('.fork_edit_file', repo=repo.name,
+                    action="{{ url_for('.fork_edit_file',
+                        repo=repo.name,
+                        username=username,
                         namespace=repo.namespace,
-                        username=username, branchname=branchname, filename=filename) }}">
+                        branchname=branchname, filename=filename) }}">
                     <button class="btn btn-sm btn-secondary"
                         onclick="fork_project.submit();">
                             Fork and Edit
@@ -118,13 +135,19 @@
                     title="View as text">Text</a>
                 {% else %}
                 <a class="btn btn-secondary btn-sm" href="{{ url_for(
-                    'view_file', username=username, namespace=repo.namespace,
-                    repo=repo.name, identifier=branchname,
+                    'view_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
                     filename=filename | unicode) }}" title="View as blob">Blob</a>
                 {% endif %}
                 <a class="btn btn-secondary btn-sm" href="{{ url_for(
-                    'view_raw_file', username=username, namespace=repo.namespace,
-                    repo=repo.name, identifier=branchname,
+                    'view_raw_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
                     filename=filename) | unicode }}" title="View as raw">Raw</a>
             </div>
           {% endif %}
@@ -141,17 +164,21 @@
         {% endautoescape %}
       </div>
     {% elif output_type == 'image' %}
-        <img src="{{ url_for('view_raw_file', username=username,
+        <img src="{{ url_for('view_raw_file',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, identifier=branchname,
+                    identifier=branchname,
                     filename=filename | unicode) }}"/>
     {% elif output_type == 'binary' %}
         <p class="noresult">
           Binary files cannot be rendered.<br/>
           Please
-          <a href="{{ url_for('view_raw_file', username=username,
+          <a href="{{ url_for('view_raw_file',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, identifier=branchname,
+                    identifier=branchname,
                     filename=filename | unicode) }}">view the raw version
           </a>
         </p>
@@ -177,8 +204,11 @@
             <td class="pagure-table-filename table-expand-col">
                 {% if entry.filemode == 16384 %}<strong>{% endif -%}
                 <a href="{{ url_for(
-                    'view_file', username=username, repo=repo.name,
-                    namespace=repo.namespace, identifier=branchname,
+                    'view_file',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    identifier=branchname,
                     filename=filename | unicode + '/' +
                     entry.name | unicode if filename else entry.name) }}">
                    {{ entry.name | unicode }}
diff --git a/pagure/templates/forks.html b/pagure/templates/forks.html
index 964c0a5..316c4a7 100644
--- a/pagure/templates/forks.html
+++ b/pagure/templates/forks.html
@@ -16,7 +16,9 @@
       <div class="list-group-item">
         <h5>
           <strong><a href="{{ url_for('view_repo',
-                namespace=repo.namespace, username=fork.user.user,repo=fork.name) }}">
+                repo=fork.name,
+                username=fork.user.user,
+                namespace=repo.namespace) }}">
               <span class="oi text-muted" data-glyph="fork"></span>
               {{ fork.user.user }}/{{ fork.name }}
           </a></strong>
diff --git a/pagure/templates/index_auth.html b/pagure/templates/index_auth.html
index 7d04f17..2edd856 100644
--- a/pagure/templates/index_auth.html
+++ b/pagure/templates/index_auth.html
@@ -36,9 +36,10 @@
             {% for repo in repos %}
               <div class="list-group-item">
                 {% set url = url_for(
-                    'view_repo', namespace=repo.namespace,
+                    'view_repo',
+                    repo=repo.name,
                     username=repo.user.username if repo.is_fork else None,
-                    repo=repo.name) %}
+                    namespace=repo.namespace) %}
                 <a href="{{ url }}">
                   {% if repo.avatar_email %}
                     <img class="projecticon pull-xs-left" src="{{ repo.avatar_email | avatar_url }}" width=20 height=20 />&nbsp;
@@ -73,9 +74,10 @@
                       </span>
                     {% else %}
                       <a class="notblue" data-toggle="tooltip"
-                        href="{{ url_for('.request_pulls', repo=repo.name,
-                        namespace=repo.namespace,
-                        username=repo.user.username if repo.is_fork else None) }}"
+                        href="{{ url_for('.request_pulls',
+                        repo=repo.name,
+                        username=repo.user.username if repo.is_fork else None,
+                        namespace=repo.namespace) }}"
                         title="{{repo.open_requests}} open pull requests in {{repo.name}}">
                         <span class="oi" data-glyph="arrow-thick-bottom"></span>
                         {{- repo.open_requests}}
@@ -112,8 +114,9 @@
               <div class="list-group-item">
                 {% set url = url_for(
                     'view_repo',
+                    repo=fork.name,
                     username=fork.user.username if fork.is_fork else None,
-                    repo=fork.name, namespace=fork.namespace) %}
+                    namespace=fork.namespace) %}
 
                 <a href="{{ url }}">
                   <span class="oi text-muted" data-glyph="fork"></span>
@@ -205,7 +208,9 @@
               <div class="list-group">
                 {% if repo.is_fork %}
                   <a class="list-group-item" href="{{ url_for(
-                    'view_repo', username=repo.user.username, repo=repo.name,
+                    'view_repo',
+                    repo=repo.name,
+                    username=repo.user.username,
                     namespace=repo.namespace) }}">
                     <div class="">
                       <strong>
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 3f13553..1651ca0 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -135,9 +135,11 @@
               <h4 id="taglist">
                 {% for tag in issue.tags %}
                   <a id="tag-{{ tag.tag }}" class="label label-default"
-                    href="{{ url_for('view_issues', username=username,
+                    href="{{ url_for('view_issues',
+                        repo=repo.name,
+                        username=username,
                         namespace=repo.namespace,
-                        repo=repo.name, tags=tag.tag) }}">
+                        tags=tag.tag) }}">
                     {{ tag.tag }}
                   </a>
                 {% endfor %}
@@ -158,7 +160,9 @@
             <div id="assignee_plain">
               {% if issue.assignee %}
                   <a href="{{ url_for(
-                    'view_issues', username=username, repo=repo.name,
+                    'view_issues',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
                     assignee=issue.assignee.username) }}">
                     {{ issue.assignee.username }}
@@ -190,9 +194,11 @@
             <div id="blocklist">
               {% for ticket in issue.parents %}
                 <a id="block-{{ ticket.id }}" class="label label-default"
-                  href="{{ url_for('view_issue', username=username,
+                  href="{{ url_for('view_issue',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, issueid=ticket.id)
+                    issueid=ticket.id)
                   }}" >#{{ ticket.id }}</a>
               {% endfor %}
             </div>
@@ -213,9 +219,11 @@
             <div id="dependlist">
               {% for ticket in issue.children %}
                 <a id="depend-{{ ticket.id }}" class="label label-default"
-                  href="{{ url_for('view_issue', username=username,
+                  href="{{ url_for('view_issue',
+                    repo=repo.name,
+                    username=username,
                     namespace=repo.namespace,
-                    repo=repo.name, issueid=ticket.id)
+                    issueid=ticket.id)
                     }}">#{{ ticket.id }}</a>
               {% endfor %}
             </div>
@@ -267,7 +275,7 @@
 {% block jscripts %}
 {{ super() }}
 <script type="text/javascript">
-  var UPLOAD_URL = "{{ url_for('upload_issue', namespace=repo.namespace, repo=repo.name, issueid=issue.id, username=username) }}";
+  var UPLOAD_URL = "{{ url_for('upload_issue', repo=repo.name, username=username, namespace=repo.namespace, issueid=issue.id) }}";
 </script>
 <script type="text/javascript"
     src="{{ url_for('static', filename='emoji/jquery.textcomplete.min.js') }}">
@@ -306,8 +314,16 @@ $(document).ready(function() {
     }
     $("#comment").atwho(userConfig);
   });
-   $.when($.get("{{ url_for('api_ns.api_view_issues', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}"),
-          $.get("{{ url_for('api_ns.api_pull_request_views', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}")
+   $.when($.get("{{ url_for('api_ns.api_view_issues',
+                            repo=repo.name,
+                            username=username,
+                            namespace=repo.namespace,
+                            status='all') }}"),
+          $.get("{{ url_for('api_ns.api_pull_request_views',
+                            repo=repo.name,
+                            username=username,
+                            namespace=repo.namespace,
+                            status='all') }}")
    ).done(function(issuesResp, prResp) {
      // 0 is the api response
      var issuesAndPrs = issuesResp[0]['issues'].concat(prResp[0]['requests']);
@@ -408,8 +424,11 @@ $(document).ready(function() {
     var closeForm = $('<form>', {
         'method': 'POST',
         'action': '{{
-        url_for('.delete_issue', namespace=repo.namespace,
-                 username=username, repo=repo.name, issueid=issueid) }}',
+        url_for('.delete_issue',
+                 repo=repo.name,
+                 username=username,
+                 namespace=repo.namespace,
+                 issueid=issueid) }}',
     }).append($('<input>', {
         'name': 'csrf_token',
         'value': '{{ form.csrf_token.current_token }}',
@@ -454,13 +473,22 @@ source.addEventListener('message', function(e) {
   console.log(e.data);
   var data = $.parseJSON(e.data);
   var _issues_url ='<a href="{{
-    url_for('view_issues', namespace=repo.namespace, username=username, repo=repo.name)}}';
+    url_for('view_issues',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace)}}';
   var _api_issues_url ='{{
-    url_for('api_ns.api_view_issue', namespace=repo.namespace,
-            username=username, repo=repo.name, issueid='-123456789')}}';
+    url_for('api_ns.api_view_issue',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            issueid='-123456789')}}';
   var _issue_url ='{{
-    url_for('view_issue', namespace=repo.namespace,
-            username=username, repo=repo.name, issueid='-123456789')}}';
+    url_for('view_issue',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            issueid='-123456789')}}';
   process_event(data, "{{ issue.uid }}", _issue_url,
                 _issues_url, _api_issues_url,
                 "{{ g.fas_user.username }}");
@@ -582,7 +610,10 @@ $( document ).ready(function() {
     create: false,
     load: function(query, callback) {
       $.getJSON(
-        "{{ url_for('api_ns.api_view_issues', namespace=repo.namespace, username=username, repo=repo.name) }}",
+        "{{ url_for('api_ns.api_view_issues',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace) }}",
         function( data ) {
           //console.log(data.issues);
           callback(data.issues);
@@ -608,7 +639,10 @@ $( document ).ready(function() {
     create: false,
     load: function(query, callback) {
       $.getJSON(
-        "{{ url_for('api_ns.api_view_issues', namespace=repo.namespace, username=username, repo=repo.name) }}",
+        "{{ url_for('api_ns.api_view_issues',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace) }}",
         function( data ) {
           //console.log(data.issues);
           callback(data.issues);
@@ -644,9 +678,9 @@ $( document ).ready(function() {
       if ($( "#previewinmarkdown" ).hasClass("inactive")){
         var _text = $( "#comment" ).val();
         var _url = "{{ url_for('markdown_preview',
+                        repo=repo.name,
                         user=repo.user.user if repo.is_fork,
-                        namespace=repo.namespace,
-                        repo=repo.name) | safe}}";
+                        namespace=repo.namespace) | safe}}";
         $.ajax({
           url: _url ,
           type: 'POST',
@@ -680,13 +714,19 @@ $( document ).ready(function() {
   {% if authenticated and g.repo_admin %}
     $("#take-btn").click(function(){
       var _url = "{{ url_for(
-        'api_ns.api_assign_issue', namespace=repo.namespace, repo=repo.name,
-        username=username, issueid=issueid
+        'api_ns.api_assign_issue',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        issueid=issueid
         ) }}";
       var _data = {assignee: "{{ g.fas_user.username }}"};
       $.post( _url, _data ).done(
         function(data) {
-          var _user_url = '\n<a href="{{ url_for("view_issues",namespace=repo.namespace, repo=repo.name, username=username) }}'
+          var _user_url = '\n<a href="{{ url_for("view_issues",
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace) }}'
             + '?assignee={{ g.fas_user.username }}">'
             + '{{ g.fas_user.username }}</a>';
           $('#assignee_plain').html(_user_url);
diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html
index d269f24..2fed964 100644
--- a/pagure/templates/issues.html
+++ b/pagure/templates/issues.html
@@ -17,8 +17,10 @@
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
     {% if repo.milestones %}
       <a href="{{ url_for(
-          'view_roadmap', namespace=repo.namespace,
-          username=username, repo=repo.name) }}"
+          'view_roadmap',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace) }}"
          class="btn btn-secondary btn-sm">
         Roadmap
       </a>
@@ -39,19 +41,27 @@
   <span class="btn-group btn-group-sm issues-tagbar" role="group" aria-label="Basic example">
     {% if status and status != 'Open' %}
       <a class="btn btn-secondary btn-sm" href="{{ url_for('view_issues',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, tags=tags, author=author, assignee=assignee) }}">Open</a>
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        tags=tags, author=author, assignee=assignee) }}">Open</a>
       <a class="btn btn-primary btn-sm" href="{{ url_for('view_issues',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, status='Closed', tags=tags, author=author,
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        status='Closed', tags=tags, author=author,
         assignee=assignee) }}">Closed</a>
     {% else %}
       <a class="btn btn-primary btn-sm" href="{{ url_for('view_issues',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, tags=tags, author=author, assignee=assignee) }}">Open</a>
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        tags=tags, author=author, assignee=assignee) }}">Open</a>
       <a class="btn btn-secondary btn-sm" href="{{ url_for('view_issues',
-        namespace=repo.namespace, username=username,
-        repo=repo.name, status='Closed', tags=tags, author=author,
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        status='Closed', tags=tags, author=author,
         assignee=assignee) }}">Closed</a>
     {% endif %}
   </span>
@@ -62,19 +72,25 @@
         {% if status and status != 'Open' %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
             href="{{ url_for('view_issues',
-                namespace=repo.namespace, username=username,
-                repo=repo.name, status='Closed') }}" title="Filter issues by tag">
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                status='Closed') }}" title="Filter issues by tag">
          {% else %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
-            href="{{ url_for('view_issues', namespace=repo.namespace,
-                username=username, repo=repo.name) }}"
+            href="{{ url_for('view_issues',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}"
                 title="Filter issues by tag">
          {% endif %}
       {% else %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{%endif%}"
             href="{{ url_for('view_issues',
-                namespace=repo.namespace, username=username,
-                repo=repo.name, tags=tag.tag,
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                tags=tag.tag,
                 author=author, assignee=assignee, status=status) }}"
                 title="Filter issues by tag">
       {% endif %}
@@ -94,21 +110,27 @@
             {% endif %}
             <th class="priority" data-sort="int">
               Priority&nbsp;(<a href="{{ url_for('view_issues',
-              namespace=repo.namespace, username=username,
-              repo=repo.name, tags=tags, author=author, assignee=assignee,
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace,
+              tags=tags, author=author, assignee=assignee,
               status=status) }}">reset</a>)
             </th>
             <th class="open_by">
               Reporter&nbsp;(<a href="{{ url_for('view_issues',
-              namespace=repo.namespace, username=username,
-              repo=repo.name, tags=tags, assignee=assignee, priority=priority,
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace,
+              tags=tags, assignee=assignee, priority=priority,
               status=status) }}">reset</a>)
             </th>
             {% if not status or status|lower == 'open' %}
             <th class="assigned">
               Assignee&nbsp;(<a href="{{ url_for('view_issues',
-              namespace=repo.namespace, username=username,
-              repo=repo.name, tags=tags, author=author, priority=priority,
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace,
+              tags=tags, author=author, priority=priority,
               status=status) }}">reset</a>)
             </th>
             {% endif %}
@@ -133,8 +155,10 @@
               <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
               {% endif %}
               <a href="{{ url_for('view_issue',
-                  namespace=repo.namespace, username=username,
-                  repo=repo.name, issueid=issue.id) }}">
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  issueid=issue.id) }}">
                 {{ issue.title | noJS("img") | safe }}
               </a>
                &nbsp;&nbsp;
@@ -168,10 +192,11 @@
               {% if issue.priority %}
 
                 <a href="{{ url_for('view_issues',
-                    namespace=repo.namespace, username=username,
-                    repo=repo.name, author=author,
-                    tags=tags, assignee=assignee, status=status,
-                    priority=issue.priority) }}"
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    author=author, tags=tags, assignee=assignee,
+                    status=status, priority=issue.priority) }}"
                     title="Filter issues by priority">{{
                   repo.priorities[issue.priority | string] }}
                 </a>
@@ -179,9 +204,11 @@
             </td>
             <td class="nowrap">
                 <a href="{{ url_for('view_issues',
-                    namespace=repo.namespace, username=username,
-                    repo=repo.name, author=issue.user.user,
-                    tags=tags, assignee=assignee, status=status) }}"
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    author=issue.user.user, tags=tags,
+                    assignee=assignee, status=status) }}"
                     title="Filter issues by reporter">
                     {{ issue.user.default_email | avatar(16) | safe }}
                     {{ issue.user.user }}
@@ -190,8 +217,10 @@
             <td class="nowrap">
             {% if not status or status|lower == 'open' %}
               {% if issue.assignee %}
-                <a href="{{ url_for('view_issues', username=username,
-                  namespace=repo.namespace, repo=repo.name,
+                <a href="{{ url_for('view_issues',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
                   assignee=issue.assignee.username,
                   tags=tags, author=author, status=status) }}"
                   title="Filter issues by assignee">
@@ -199,9 +228,11 @@
                   {{ issue.assignee.user }}
                 </a>
               {% else %}
-                <a class="text-muted" href="{{ url_for(
-                  'view_issues', username=username, namespace=repo.namespace,
-                  repo=repo.name, tags=tags, author=author, status=status,
+                <a class="text-muted" href="{{ url_for('view_issues',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  tags=tags, author=author, status=status,
                   assignee=0) }}">unassigned
                 </a>
               {% endif %}
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index a54deae..740a78e 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -27,13 +27,17 @@
       <div class="card-block">
         {% if not type or type == 'new' %}
           <form action="{{ url_for('.new_issue',
-                namespace=repo.namespace, username=username, repo=repo.name)
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace)
             }}" method="post" enctype="multipart/form-data">
 
         {% elif type and type == 'edit' %}
           <form action="{{ url_for('.edit_issue',
-                namespace=repo.namespace, username=username,
-                repo=repo.name, issueid=issueid) }}" method="post"
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                issueid=issueid) }}" method="post"
                 enctype="multipart/form-data">
         {% endif %}
         {{ render_bootstrap_field(form.title, field_description="Gist of your issue") }}
@@ -101,8 +105,11 @@
 
     {% if authenticated and g.repo_admin and type and type == 'edit' %}
     <form method="post" class="pull-xs-right" action="{{
-        url_for('.delete_issue', namespace=repo.namespace,
-                username=username, repo=repo.name, issueid=issueid) }}">
+        url_for('.delete_issue',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                issueid=issueid) }}">
       <button class="btn btn-danger" type="submit"
           onclick="return confirm('Are you sure to delete this ticket? \nThis is final and cannot be un-done.');"
           title="Delete this ticket">
@@ -137,8 +144,10 @@ $(document).ready(function() {
       _txt += '\n';
     }
     var _loc = "{{ url_for('view_issue_raw_file',
-        namespace=repo.namespace, repo=repo.name,
-        username=username, filename='') }}" + this.file;
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        filename='') }}" + this.file;
 
     $("#issue_content").val(_txt + '<!!image>');
   });
@@ -163,9 +172,9 @@ $(document).ready(function() {
     var _type = $("#type").val();
     var _url = "{{
       url_for('internal_ns.get_ticket_template',
+              repo=repo.name,
               username=repo.username if repo.is_fork else None,
-              namespace=repo.namespace,
-              repo=repo.name) }}";
+              namespace=repo.namespace) }}";
     _url += '?template=' + _type;
     $.ajax({
       url: _url ,
@@ -194,9 +203,9 @@ $(function() {
       if ($( "#previewinmarkdown" ).hasClass("inactive")){
         var _text = $( "#issue_content" ).val();
         var _url = "{{ url_for('markdown_preview',
-                        namespace=repo.namespace,
+                        repo=repo.name,
                         user=repo.user.user if repo.is_fork,
-                        repo=repo.name) | safe}}";
+                        namespace=repo.namespace) | safe}}";
         $.ajax({
           url: _url ,
           type: 'POST',
diff --git a/pagure/templates/plugin.html b/pagure/templates/plugin.html
index 34faa4c..883eff4 100644
--- a/pagure/templates/plugin.html
+++ b/pagure/templates/plugin.html
@@ -14,7 +14,9 @@
 {% endif %}
 
   <form action="{{ url_for('.view_plugin',
-        namespace=repo.namespace, username=username, repo=repo.name,
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
         plugin=plugin.name) }}" method="post">
   {{ plugin.description | markdown | noJS | safe }}
 
diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 2a17c0e..293320b 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -47,9 +47,11 @@
           <div class="btn-group" role="group" aria-label="Basic example">
             <a class="btn btn-sm btn-primary"
                href="{{ url_for(
-                'request_pull_edit', username=username,
+                'request_pull_edit',
+                repo=repo.name,
+                username=username,
                 namespace=repo.namespace,
-                repo=repo.name, requestid=requestid) }}"
+                requestid=requestid) }}"
                title="Update title"><span class="oi" data-glyph="pencil"></span></a>
      {% if pull_request.status == 'Open' and authenticated and
         (g.repo_admin or g.fas_user.username == pull_request.user.username) %}
@@ -82,9 +84,9 @@
     }}</span> <span class="pr-toplabel">
     <span class="oi" data-glyph="random"> </span>
     <a href="{{ url_for('view_repo_branch',
+          repo=pull_request.project_from.name,
           username=pull_request.project_from.user.user
             if pull_request.project_from.is_fork else None,
-          repo=pull_request.project_from.name,
           namespace=repo.namespace,
           branchname=pull_request.branch_from)
         }}">
@@ -95,9 +97,9 @@
     <span class="pr-toplabel">{{ pull_request.project.fullname }}</span>
     <span class="pr-toplabel"><span class="oi" data-glyph="random"></span>
     <a href="{{ url_for('view_repo_branch',
+          repo=pull_request.project.name,
           username=pull_request.project.user.user
             if pull_request.project.is_fork else None,
-          repo=pull_request.project.name,
           namespace=repo.namespace,
           branchname=pull_request.branch)
         }}">
@@ -115,8 +117,11 @@
 <h2>Create pull request</h2>
 {% else %}
 <h2>Diff
-      (<a href="{{ url_for('view_tree', username=username,
-          namespace=repo.namespace, repo=repo.name, identifier=commitid) }}"
+      (<a href="{{ url_for('view_tree',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            identifier=commitid) }}"
       >tree</a>)</h2>
 
     {% if origin == 'compare_commits' %}
@@ -128,14 +133,19 @@
 {% if form and (g.repo_admin or remote_git) %}
 <section class="new_project">
   {% if remote_git %}
-  <form action="{{ url_for('.new_remote_request_pull', username=username,
-    namespace=repo.namespace, repo=repo.name, confirm=True) }}" method="post">
+  <form action="{{ url_for('.new_remote_request_pull',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        confirm=True) }}" method="post">
     <input type="hidden" value="{{ branch_from }}" name="branch_from" />
     <input type="hidden" value="{{ remote_git }}" name="git_repo" />
   {% else %}
-  <form action="{{ url_for('.new_request_pull', username=username,
-    namespace=repo.namespace,
-    repo=repo.name, commitid=commitid, branch_from=branch_from,
+  <form action="{{ url_for('.new_request_pull',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        commitid=commitid, branch_from=branch_from,
     branch_to=branch_to) }}" method="post">
   {% endif %}
     <div class="p-b-1">
@@ -196,7 +206,9 @@
       <input type="submit" class="btn btn-primary" value="Create">
       {{ form.csrf_token }}
       <a class="btn btn-secondary" href="{{ url_for(
-        'view_repo', username=username, repo=repo.name,
+        'view_repo',
+        repo=repo.name,
+        username=username,
         namespace=repo.namespace)}}">
         Cancel
       </a>
@@ -233,8 +245,11 @@
   {% if pull_request %}
   <li class="nav-item pull-xs-right">
     <a class="nav-link" href="{{ url_for(
-        'request_pull_patch', username=username,
-        namespace=repo.namespace, repo=repo.name, requestid=requestid) }}">
+        'request_pull_patch',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        requestid=requestid) }}">
       <span class="hidden-sm-down">Patch</span>
     </a>
   </li>
@@ -251,18 +266,20 @@
             <a class="list-group-item" href="{{
                 url_for(
                     'view_commit',
+                    repo=pull_request.project_from.name,
                     username=pull_request.project_from.user.user,
                     namespace=repo.namespace,
-                    repo=pull_request.project_from.name,
                     commitid=commit.oid.hex)
                 }}">
             {% elif pull_request and pull_request.remote %}
             <a>
             {% else %}
             <a class="list-group-item" href="{{
-                url_for('view_commit', username=username,
+                url_for('view_commit',
+                        repo=repo.name,
+                        username=username,
                         namespace=repo.namespace,
-                        repo=repo.name, commitid=commit.oid.hex)}}">
+                        commitid=commit.oid.hex)}}">
             {% endif %}
 
             <h5>
@@ -288,8 +305,11 @@
       if not pull_request %}active{%
       endif %}" role="tabpanel" id="request_diff">
     {% if authenticated and pull_request %}
-    <form action="{{ url_for('.pull_request_drop_comment', username=username,
-        namespace=repo.namespace, repo=repo.name, requestid=requestid)
+    <form action="{{ url_for('.pull_request_drop_comment',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            requestid=requestid)
         }}" method="post" class="icon"
         onsubmit="return try_async_comment(this, null)" >
     {% endif %}
@@ -358,9 +378,9 @@
               <a href="{{
                   url_for(
                       'view_file',
+                      repo=pull_request.project_from.name,
                       username=pull_request.project_from.user.username
                           if pull_request.project_from.is_fork else None,
-                      repo=pull_request.project_from.name,
                       namespace=pull_request.project_from.namespace,
                       identifier=identifier,
                       filename=filepath) }}"
@@ -371,8 +391,8 @@
               <a href="{{
                   url_for(
                       'view_file',
-                      username=username,
                       repo=repo.name,
+                      username=username,
                       namespace=repo.namespace,
                       identifier=identifier,
                       filename=filepath) }}"
@@ -488,8 +508,11 @@
   <div class="tab-pane active" role="tabpanel" id="comments">
     <section class="request_comment" id="request_comment">
     {% if pull_request.comments %}
-      <form action="{{ url_for('.pull_request_drop_comment', username=username,
-          namespace=repo.namespace, repo=repo.name, requestid=requestid)
+      <form action="{{ url_for('.pull_request_drop_comment',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            requestid=requestid)
           }}" method="post"
           onsubmit="return try_async_comment(this, null)">
 
@@ -542,8 +565,11 @@
 
           {% if authenticated %}
             <form action="{{ url_for(
-                'pull_request_add_comment', username=username, repo=repo.name,
-                namespace=repo.namespace, requestid=requestid) }}"
+                'pull_request_add_comment',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                requestid=requestid) }}"
                 method="post" onsubmit="return try_async_comment(this, false)">
               {{ mergeform.csrf_token }}
 
@@ -594,8 +620,11 @@
       <div id="merge-alert" class="alert text-xs-center" style="display:none;" role="alert">
       {% if pull_request.status == 'Open' and g.repo_admin %}
        <div>
-        <form action="{{ url_for('merge_request_pull', username=username,
-            namespace=repo.namespace, repo=repo.name, requestid=requestid)
+        <form action="{{ url_for('merge_request_pull',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                requestid=requestid)
           }}" method="POST">
           {{ mergeform.csrf_token }}
           <button id="merge_btn" type="submit" class="btn btn-block">Merge</button>
@@ -622,7 +651,11 @@
               <li class="list-group-item">
                 <div>
                   <span><a href="{{ flag.url }}">{{ flag.username }}</a></span>
-                  <div class="pull-xs-right"><span class="label {%if flag.percent <= 10%}label-danger{%elif flag.percent <= 90%}label-warning{%else%}label-success{%endif%}">{{ flag.percent }}%</label></div>
+                  <div class="pull-xs-right"><span class="label {%
+                    if flag.percent <= 10 %}label-danger{%
+                    elif flag.percent <= 90 %}label-warning{%
+                    else %}label-success{%
+                    endif %}">{{ flag.percent }}%</label></div>
                 </div>
                 <small><div class="clearfix">
                     <span>{{ flag.comment }}</span>
@@ -640,7 +673,9 @@
       <div class="card-block">
         {% if authenticated and mergeform and pull_request.status == 'Open' and g.repo_admin %}
           <form method="POST" action="{{ url_for('.set_assignee_requests',
-              username=username, repo=repo.name, namespace=repo.namespace,
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace,
               requestid=requestid) }}">
             <fieldset class="form-group issue-metadata-form">
               <label><strong>Assignee</strong></label>
@@ -900,7 +935,9 @@ function setup_reply_btns() {
       var filename = $( this ).attr('data-filename');
       var tree_id = $( this ).attr('data-tree');
       var url = "{{ url_for(
-        'pull_request_add_comment', username=username, repo=repo.name,
+        'pull_request_add_comment',
+        repo=repo.name,
+        username=username,
         namespace=repo.namespace,
         requestid=requestid, commit='', filename='', row='') }}".slice(0, -2);
       url = url + commit + '/' + filename + '/' + row
@@ -945,9 +982,9 @@ function setup_reply_btns() {
         if ($( "#previewinmarkdown" ).hasClass("inactive")){
           var _text = $( "#comment" ).val();
           var _url = "{{ url_for('markdown_preview',
+                        repo=repo.name,
                         user=repo.user.user if repo.is_fork,
-                        namespace=repo.namespace,
-                        repo=repo.name) | safe}}";
+                        namespace=repo.namespace) | safe}}";
           $.ajax({
             url: _url ,
             type: 'POST',
@@ -1225,8 +1262,16 @@ $(document).ready(function () {
    });
 
    {% if config.get('ENABLE_TICKETS', True) %}
-     $.when($.get("{{ url_for('api_ns.api_view_issues', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}"),
-            $.get("{{ url_for('api_ns.api_pull_request_views', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}")
+     $.when($.get("{{ url_for('api_ns.api_view_issues',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    status='all') }}"),
+            $.get("{{ url_for('api_ns.api_pull_request_views',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    status='all') }}")
      ).done(function(issuesResp, prResp) {
        // 0 is the api response
        var issuesAndPrs = issuesResp[0]['issues'].concat(prResp[0]['requests']);
@@ -1245,7 +1290,11 @@ $(document).ready(function () {
        $("#comment").atwho(issueAndPrConfig);
       });
    {% else %}
-     $.get("{{ url_for('api_ns.api_pull_request_views', namespace=repo.namespace, repo=repo.name, username=username, status='all') }}")
+     $.get("{{ url_for('api_ns.api_pull_request_views',
+                        repo=repo.name,
+                        username=username,
+                        namespace=repo.namespace,
+                        status='all') }}")
          .done(function(prResp) {
              var data = $.map(prResp['requests'], function(pr, idx) {
                  return {
diff --git a/pagure/templates/pull_request_comment.html b/pagure/templates/pull_request_comment.html
index c18d858..67859fc 100644
--- a/pagure/templates/pull_request_comment.html
+++ b/pagure/templates/pull_request_comment.html
@@ -3,7 +3,9 @@
 <section class="add_comment">
 
   <form action="{{ url_for(
-    'pull_request_add_comment', username=username, repo=repo.name,
+    'pull_request_add_comment',
+    repo=repo.name,
+    username=username,
     namespace=repo.namespace,
     requestid=requestid, commit=commit, tree_id=tree_id, filename=filename,
     row=row) }}"
diff --git a/pagure/templates/pull_request_title.html b/pagure/templates/pull_request_title.html
index 94fbf66..91cb6bd 100644
--- a/pagure/templates/pull_request_title.html
+++ b/pagure/templates/pull_request_title.html
@@ -22,7 +22,9 @@
       </div>
       <div class="card-block" class="edit_tag">
         <form action="{{ url_for('.request_pull_edit',
-            namespace=repo.namespace, username=username, repo=repo.name,
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
             requestid=request.id) }}" method="post">
 
           <table>
@@ -37,8 +39,10 @@
             <input type="submit" class="btn btn-primary" value="Edit">
             {{ form.csrf_token }}
             <a href="{{ url_for('request_pull',
+              repo=repo.name,
+              username=username,
               namespace=repo.namespace,
-              username=username, repo=repo.name, requestid=request.id)}}">
+              requestid=request.id)}}">
               <input type="button" class="btn btn-secondary" value="Cancel" />
             </a>
             {{ form.csrf_token }}
diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html
index 8284fc4..915a3e8 100644
--- a/pagure/templates/releases.html
+++ b/pagure/templates/releases.html
@@ -11,7 +11,9 @@
 {% if config.get('UPLOAD_FOLDER_PATH') and config.get('UPLOAD_FOLDER') %}
   {% if g.repo_admin %}
     <a class="pull-xs-right" href="{{ url_for('.new_release',
-            namespace=repo.namespace, username=username, repo=repo.name) }}"
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace) }}"
         method="get" class="icon">
     <button class="btn btn-primary" type="submit" title="Upload a tarball">
       <span class="icon icon-plus blue"></span>
@@ -36,7 +38,9 @@
   <div class="list-group">
     {% for tag in tags %}
       <a class="list-group-item" href="{{ url_for('.view_tree',
-            namespace=repo.namespace, username=username, repo=repo.name,
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
             identifier=tag['object'].oid) }}">
         <div class="pull-xs-right">{{tag['date'] | humanize}}
           <span id="tagid" class="label label-default">
diff --git a/pagure/templates/remote_pull_request.html b/pagure/templates/remote_pull_request.html
index 7d5dd25..6bb03ec 100644
--- a/pagure/templates/remote_pull_request.html
+++ b/pagure/templates/remote_pull_request.html
@@ -30,8 +30,10 @@
 
 {% if form %}
   <form action="{{ url_for(
-    '.new_remote_request_pull', namespace=repo.namespace, username=username,
-    repo=repo.name) }}" method="post">
+    '.new_remote_request_pull',
+    repo=repo.name,
+    username=username,
+    namespace=repo.namespace) }}" method="post">
     <div class="card-block">
       {{ render_bootstrap_field(
           form.title, size=80,
@@ -56,8 +58,10 @@
       {{ form.csrf_token }}
 
       <a href="{{ url_for(
-        'view_repo', namespace=repo.namespace,
-        username=username, repo=repo.name)}}">
+        'view_repo',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace)}}">
         <input type="button" class="btn btn-secondary" value="Cancel" />
       </a>
     </p>
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index 833cf93..3cf2c9c 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -88,8 +88,10 @@ git push -u origin master</pre>
                   <span class="oi text-muted" data-glyph="random"
                     title="Default branch"></span>
                   <a href="{{ url_for('view_repo_branch',
-                    username=username, namespace=repo.namespace,
-                    repo=repo.name, branchname=head) }}"
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    branchname=head) }}"
                     title="{{ head }}" data-toggle="tooltip">
                     {{ head }}
                   </a>
@@ -108,8 +110,10 @@ git push -u origin master</pre>
                   <span class="oi text-muted" data-glyph="random"></span>
                   {% if branchname != branch %}
                   <a class="" href="{{ url_for('view_repo_branch',
-                    username=username, repo=repo.name, branchname=branch,
-                    namespace=repo.namespace) }}"
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    branchname=branch) }}"
                     title="{{ branch }}" data-toggle="tooltip">{{ branch }}
                   </a>
                   {% else %}
@@ -121,8 +125,10 @@ git push -u origin master</pre>
                   {% if g.repo_admin and branch != head %}
                   <form id="delete_branch_form-{{ branch | replace('/', '_') }}" action="{{
                     url_for('.delete_branch',
-                            username=username, repo=repo.name,
-                            namespace=repo.namespace, branchname=branch)
+                            repo=repo.name,
+                            username=username,
+                            namespace=repo.namespace,
+                            branchname=branch)
                     }}" method="post" class="inline icon del_icon"
                     onsubmit="return confirm('Are you sure you want to remove the branch: {{ branch }}?\nThis cannot be un-done!');">
                     {{ form.csrf_token }}
@@ -224,9 +230,11 @@ git push -u origin master</pre>
               <div class="list-group list-group-flush">
                 {% for commit in last_commits %}
                   <a href="{{
-                      url_for('view_commit', username=username,
+                      url_for('view_commit',
+                      repo=repo.name,
+                      username=username,
                       namespace=repo.namespace,
-                      repo=repo.name, commitid=commit.hex) }}" class="list-group-item">
+                      commitid=commit.hex) }}" class="list-group-item">
                     <div class="commitdate" title="{{ commit.commit_time|format_ts }}">
                       <small>
                         <strong>
@@ -326,8 +334,8 @@ $(function() {
           var url = "{{ url_for(
               'request_pull',
               repo=repo.name,
-              namespace=repo.namespace,
               username=repo.user.user if repo.is_fork else None,
+              namespace=repo.namespace,
               requestid=-100) }}";
           url = url.replace(-100, res.message.branch_w_pr[branch]);
           var html = ' \
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index 483ad62..e027c29 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -26,15 +26,19 @@
               {% if repo.settings.get('issue_tracker', True)
                     and config.get('ENABLE_TICKETS', True)%}
               <a href="{{ url_for('new_issue',
-                  namespace=repo.namespace, username=username, repo=repo.name) }}"
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace) }}"
                 class="btn btn-success btn-sm">New Issue</a>
               {% endif %}
               <div class="btn-group">
               {% if not repo.is_fork %}
                 <form method="POST" name="fork_project" id="fork_project"
                   action="{{ url_for(
-                    '.fork_project', namespace=repo.namespace,
-                    repo=repo.name, username=username) }}">
+                    '.fork_project',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace) }}">
                   {{ forkbuttonform.csrf_token }}
                 </form>
                 <button class="btn btn-sm btn-secondary"
@@ -42,11 +46,16 @@
                   <span class="oi" data-glyph="fork"></span> Fork</button>
               {% endif %}
                 <button title="{%- if is_watching(
-                    repo.name, repo.namespace, repo.user.user if repo.is_fork else None)
+                    repo.name,
+                    repo.user.user if repo.is_fork else None,
+                    repo.namespace)
                 %}You are watching this project{% else
                 %}You are not watching this project{% endif -%}"
                 type="button" class="btn btn-sm dropdown-toggle
-                {%- if is_watching(repo.name, repo.user.user if repo.is_fork else None)
+                {%- if is_watching(
+                    repo.name,
+                    repo.user.user if repo.is_fork else None,
+                    repo.namespace)
                 %} btn-primary{% else %} btn-secondary{% endif -%}"
                 data-toggle="dropdown" id="watch-button">
                   <span class="oi" data-glyph="eye"></span>
@@ -54,10 +63,14 @@
                 <div class="dropdown-menu dropdown-menu-right watch-menu">
                   <form method="POST" id="watch_project" name="watch_project"
                       action="{{ url_for('.watch_repo',
-                        namespace=repo.namespace,
+                        repo=repo.name,
                         user=repo.user.user if repo.is_fork else None,
-                        repo=repo.name, watch=0) }}">
-                   {%- if is_watching(repo.name, repo.user.user if repo.is_fork else None)
+                        namespace=repo.namespace,
+                        watch=0) }}">
+                   {%- if is_watching(
+                        repo.name,
+                        repo.user.user if repo.is_fork else None,
+                        repo.namespace)
                    %}
                    <a class="dropdown-item" id="unwatch_button">Stop watching {{repo.name}}</a>
                    {% else %}
@@ -82,8 +95,8 @@
             <a href="{{ url_for(
                 'view_repo',
                 repo=repo.parent.name,
-                namespace=repo.parent.namespace,
-                username=repo.parent.user.user if repo.parent.is_fork else None)}}">
+                username=repo.parent.user.user if repo.parent.is_fork else None,
+                namespace=repo.parent.namespace)}}">
                 {{ repo.parent.namespace + '/' if repo.parent.namespace }}{{ repo.parent.fullname }}
             </a>
         </div>
@@ -103,8 +116,10 @@
           if select == 'overview' %}class="nav-link active" {%
           else %}class="nav-link" {%
           endif %}href="{{ url_for(
-              'view_repo', namespace=repo.namespace,
-              username=username, repo=repo.name) }}">
+              'view_repo',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace) }}">
             <span class="oi hidden-md-up" data-glyph="home"></span>
             <span class="hidden-sm-down">Overview</span>
         </a>
@@ -115,8 +130,10 @@
             if select == 'docs' %}class="active nav-link" {%
             else %}class="nav-link" {%
             endif %}href="{{ url_for(
-                '.view_docs', namespace=repo.namespace, username=username,
-                repo=repo.name) }}">
+                '.view_docs',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">
               <span class="oi hidden-md-up" data-glyph="book"></span>
               <span class="hidden-sm-down">Docs</span>
           </a>
@@ -129,8 +146,11 @@
             if select == 'commits' %}class="active nav-link" {%
             else %}class="nav-link" {%
             endif %}href="{{ url_for(
-                '.view_commits', username=username, namespace=repo.namespace,
-                repo=repo.name, branchname=branchname) }}">
+                '.view_commits',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                branchname=branchname) }}">
               <span class="oi hidden-md-up" data-glyph="spreadsheet">
               </span><span class="hidden-sm-down">Commits</span>
             </a>
@@ -142,8 +162,11 @@
             if select == 'tree' %}class="active nav-link" {%
             else %}class="nav-link"{%
             endif %} href="{{ url_for(
-                '.view_tree', username=username, namespace=repo.namespace,
-                repo=repo.name, identifier=branchname) }}">
+                '.view_tree',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                identifier=branchname) }}">
               <span class="oi hidden-md-up" data-glyph="file"></span>
               <span class="hidden-sm-down">Files</span>
           </a>
@@ -154,8 +177,10 @@
             if select == 'tags' %}class="active nav-link" {%
             else %}class="nav-link" {%
             endif %}href="{{ url_for(
-                '.view_tags', username=username, namespace=repo.namespace,
-                repo=repo.name) }}">
+                '.view_tags',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">
               <span class="oi hidden-md-up" data-glyph="box"></span>
               <span class="hidden-sm-down">Releases</span>
           </a>
@@ -168,8 +193,10 @@
               if select == 'issues' %}class="active nav-link" {%
               else %}class="nav-link" {%
               endif %}href="{{ url_for(
-                  '.view_issues', username=username, namespace=repo.namespace,
-                  repo=repo.name) }}">
+                  '.view_issues',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace) }}">
                 <span class="oi hidden-md-up" data-glyph="warning"></span>
                 <span class="hidden-sm-down">Issues&nbsp;</span>
                 <span class="label label-default label-pill hidden-sm-down">
@@ -185,8 +212,10 @@
             if select == 'requests' %}class="active nav-link" {%
             else %}class="nav-link" {%
             endif %}href="{{ url_for(
-                '.request_pulls', username=username, namespace=repo.namespace,
-                repo=repo.name) }}">
+                '.request_pulls',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">
               <span class="oi hidden-md-up" data-glyph="task"></span>
               <span class="hidden-sm-down">Pull Requests&nbsp;</span>
               <span class="label label-default label-pill hidden-sm-down">
@@ -202,8 +231,10 @@
             if select == 'forks' %}class="active nav-link" {%
             else %}class="nav-link" {%
             endif %}href="{{ url_for(
-                '.view_forks', username=username, namespace=repo.namespace,
-                repo=repo.name) }}">
+                '.view_forks',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">
               <span class="oi hidden-md-up" data-glyph="fork"></span>
               <span class="hidden-sm-down">Forks&nbsp;</span>
               <span class="hidden-sm-down label label-default label-pill">
@@ -220,8 +251,10 @@
               if select == 'settings' %}class="active nav-link" {%
               else %}class="nav-link" {%
               endif %}href="{{ url_for(
-                  '.view_settings', namespace=repo.namespace,
-                  repo=repo.name, username=username) }}">
+                  '.view_settings',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace) }}">
                 <span class="oi" data-glyph="cog"></span>
                 <span class="hidden-sm-down">Settings</span>
             </a>
@@ -231,8 +264,11 @@
       {% if endpoint == 'view_docs' %}
       <li class="nav-item pull-xs-right">
         <a class="nav-link" href="{{ config['DOC_APP_URL'] + url_for(
-            '.view_repo', namespace=repo.namespace,
-            username=username, repo=repo.name, filename=filename)
+            '.view_repo',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            filename=filename)
           }}" target="_blank" title="Open to a new tab" rel="noopener noreferrer">
           <span class="oi" data-glyph="external-link"></span>
         </a>
diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 8104f76..e52480b 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -26,8 +26,10 @@
       </button>
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
         <a class="dropdown-item" href="{{ url_for(
-            'new_remote_request_pull', namespace=repo.namespace,
-            username=username, repo=repo.name) }}">
+            'new_remote_request_pull',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace) }}">
           <small>Remote pull-request</small>
         </a>
       </div>
@@ -41,18 +43,25 @@
             if status|lower in ['open', 'true'] %}btn-primary{%
             else %}btn-secondary{%
             endif %} btn-sm" href="{{ url_for(
-                'request_pulls', username=username, namespace=repo.namespace,
-                repo=repo.name) }}">Open</a>
+                'request_pulls',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">Open</a>
       <a class="btn {%
         if status|lower in ['open', 'true'] %}btn-secondary{%
         else %}btn-primary{%
         endif %} btn-sm" href="{{ url_for(
-            'request_pulls', username=username, namespace=repo.namespace,
-            repo=repo.name, status=0) }}">Closed</a>
+            'request_pulls',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace,
+            status=0) }}">Closed</a>
   </span>
   <a class="btn btn-secondary btn-sm pull-xs-right" href="{{ url_for(
-    'request_pulls', namespace=repo.namespace,
-    username=username, repo=repo.name) }}">Reset Filters</a>
+    'request_pulls',
+    repo=repo.name,
+    username=username,
+    namespace=repo.namespace) }}">Reset Filters</a>
 </div>
 </div>
 <div class="card m-t-1">
@@ -66,14 +75,20 @@
             {% endif %}
             <th class="open_by">
               Reporter(<a href="{{ url_for(
-                'request_pulls', username=username, namespace=repo.namespace,
-                repo=repo.name, assignee=assignee, status=status) }}">reset</a>)
+                'request_pulls',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                assignee=assignee, status=status) }}">reset</a>)
             </th>
             {% if status|lower == 'open' %}
             <th class="assigned">
               Assignee(<a href="{{ url_for(
-                'request_pulls', username=username, namespace=repo.namespace,
-                repo=repo.name, author=author, status=status) }}">reset</a>)
+                'request_pulls',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                author=author, status=status) }}">reset</a>)
             </th>
             {% endif %}
         </tr>
@@ -85,8 +100,11 @@
         <tr>
             <td>
               <a href="{{ url_for(
-                  'request_pull', username=username, namespace=repo.namespace,
-                  repo=repo.name, requestid=request.id) }}">
+                  'request_pull',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  requestid=request.id) }}">
                 <span class="label label-default">PR#{{ request.id }}</span>
                 {% if status|lower not in ['open', 'true'] %}<span class="label {%
                     if request.status|lower == 'merged' %}label-success{%
@@ -119,9 +137,11 @@
             {% endif %}
             <td class="nowrap">
               <a href="{{ url_for(
-                  'request_pulls', username=username,
+                  'request_pulls',
+                  repo=repo.name,
+                  username=username,
                   namespace=repo.namespace,
-                  repo=repo.name, author=request.user.user,
+                  author=request.user.user,
                   assignee=assignee, status=status) }}"
                   title="Filter requests by reporter">
                 {{ request.user.default_email | avatar(16) | safe }}
@@ -132,9 +152,11 @@
             <td class="nowrap">
               {% if request.assignee %}
               <a href="{{ url_for(
-                'request_pulls', username=username,
+                'request_pulls',
+                repo=repo.name,
+                username=username,
                 namespace=repo.namespace,
-                repo=repo.name, assignee=request.assignee.username,
+                assignee=request.assignee.username,
                 author=author, status=status) }}"
                 title="Filter issues by assignee">
                 {{ request.assignee.default_email | avatar(16) | safe }}
@@ -142,8 +164,11 @@
               </a>
               {% else %}
               <a class="text-muted" href="{{ url_for(
-                'request_pulls', username=username, namespace=repo.namespace,
-                repo=repo.name, author=author, status=status) }}">unassigned</a>
+                'request_pulls',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                author=author, status=status) }}">unassigned</a>
               {% endif %}
             </td>
             {% endif %}
@@ -185,9 +210,9 @@ $(function() {
         for (branch in res.message){
             var url = "{{ url_for(
             'new_request_pull',
-            namespace=repo.namespace,
             repo=repo.name,
             username=g.fas_user.username,
+            namespace=repo.namespace,
             branch_to=head,
             branch_from='') }}" + branch;
           html = '<small><a class="dropdown-item" \
@@ -224,9 +249,9 @@ $(function() {
         for (branch in res.message){
           var url = "{{ url_for(
             'new_request_pull',
-            namespace=repo.namespace,
             repo=repo.name,
             username=repo.user.user if repo.is_fork else None,
+            namespace=repo.namespace,
             branch_to=head,
             branch_from='') }}";
           html = '<small><a class="dropdown-item" href="' + url + branch + '">'
diff --git a/pagure/templates/roadmap.html b/pagure/templates/roadmap.html
index 064cbff..97ce6fb 100644
--- a/pagure/templates/roadmap.html
+++ b/pagure/templates/roadmap.html
@@ -12,13 +12,17 @@
     {{ issues|count }} Milestones
     <span class="btn-group btn-group-sm pull-xs-right" role="group">
       <a href="{{ url_for(
-          'view_issues', namespace=repo.namespace, username=username,
-          repo=repo.name) }}" class="btn btn-secondary btn-sm">
+          'view_issues',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace) }}" class="btn btn-secondary btn-sm">
         List
       </a>
       <a href="{{ url_for(
-          'new_issue', namespace=repo.namespace, username=username,
-          repo=repo.name) }}" class="btn btn-success btn-sm">
+          'new_issue',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace) }}" class="btn btn-success btn-sm">
         New Issue
       </a>
     </span>
@@ -37,18 +41,28 @@
   <span class="btn-group btn-group-sm issues-tagbar" role="group">
     {% if not status %}
       <a class="btn btn-secondary btn-sm" href="{{ url_for(
-          'view_roadmap', namespace=repo.namespace,
-          username=username, repo=repo.name) }}">Open</a>
+          'view_roadmap',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace) }}">Open</a>
       <a class="btn btn-primary btn-sm" href="{{ url_for(
-          'view_roadmap', namespace=repo.namespace,
-          username=username, repo=repo.name, status='All') }}">All</a>
+          'view_roadmap',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          status='All') }}">All</a>
     {% else %}
       <a class="btn btn-primary btn-sm" href="{{ url_for(
-          'view_roadmap', namespace=repo.namespace,
-          username=username, repo=repo.name) }}">Open</a>
+          'view_roadmap',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace) }}">Open</a>
       <a class="btn btn-secondary btn-sm" href="{{ url_for(
-          'view_roadmap',namespace=repo.namespace,
-           username=username, repo=repo.name, status='All') }}">All</a>
+          'view_roadmap',
+          repo=repo.name,
+          username=username,
+          namespace=repo.namespace,
+          status='All') }}">All</a>
     {% endif %}
   </span>
   <span class="oi m-l-2" data-glyph="tag"></span>
@@ -57,15 +71,21 @@
       {% if tag.tag in tags %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{% endif %}"
             href="{{ url_for(
-                'view_roadmap', username=username, namespace=repo.namespace,
-                repo=repo.name, milestone=tag.tag,
+                'view_roadmap',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                milestone=tag.tag,
                 status='All' if not status else None) }}"
                    title="Filter issues by milestone">
       {% else %}
         <a class="btn btn-secondary btn-sm {% if tag.tag in tags%}active{%endif%}"
             href="{{ url_for(
-                'view_roadmap', username=username, namespace=repo.namespace,
-                repo=repo.name, milestone=tag.tag,
+                'view_roadmap',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                milestone=tag.tag,
                 status='All' if not status else None) }}"
                    title="Filter issues by milestone">
       {% endif %}
@@ -109,8 +129,11 @@
               <span class="oi red-icon" data-glyph="lock-locked" title="Private issue"></span>
               {% endif %}
               <a {% if issue.status != 'Open' %}class="text-muted"{% endif %} href="{{ url_for(
-                  'view_issue', username=username, namespace=repo.namespace,
-                  repo=repo.name, issueid=issue.id) }}">
+                  'view_issue',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  issueid=issue.id) }}">
                 {{ issue.title | noJS("img") | safe }}
               </a>
                &nbsp;&nbsp;
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 6bea955..7c09894 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -16,8 +16,10 @@
           Project Details
         </div>
         <div class="card-block">
-          <form action="{{ url_for('.update_project', namespace=repo.namespace,
-                          username=username, repo=repo.name) }}" method="post">
+          <form action="{{ url_for('.update_project',
+                          repo=repo.name,
+                          username=username,
+                          namespace=repo.namespace) }}" method="post">
             <fieldset class="form-group">
               <label for="description">Description</label>
               <input class="form-control" name="description" value="{{
@@ -54,8 +56,9 @@
         </div>
         <div class="card-block">
           <form action="{{ url_for('change_ref_head',
-                namespace=repo.namespace,
-                username=username, repo=repo.name) }}" method="post">
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}" method="post">
             {{ branches_form.csrf_token }}
             {{ branches_form.branches(class_="c-select") }}
             <input class="btn btn-primary" type="submit" value="Make Default"/>
@@ -86,7 +89,9 @@
           </div>
 
           <form action="{{ url_for('.new_repo_hook_token',
-                namespace=repo.namespace, username=username, repo=repo.name) }}"
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}"
               method="post" class="icon">
           <button class="btn btn-primary" type="submit"
             onclick="return confirm('Are you sure to generate a new token for '
@@ -141,8 +146,11 @@
             {% else %}
               <span class="text-success btn-align"><strong>Valid</strong> until: {{ token.expiration.date() }}</span>
               <form class="pull-xs-right" action="{{ url_for(
-                  '.revoke_api_token', namespace=repo.namespace,
-                  username=username, repo=repo.name, token_id=token.id) }}"
+                  '.revoke_api_token',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  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 ?'
@@ -186,8 +194,10 @@
         {% endif %}
         <div class="card-block">
           <a href="{{ url_for(
-                '.add_token', namespace=repo.namespace, username=username,
-                repo=repo.name) }}"
+                '.add_token',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}"
               method="post" class="icon">
           <button class="btn btn-primary" type="submit"
             title="Generate a new API token">
@@ -206,8 +216,9 @@
         </div>
         <div class="card-block">
           <form action="{{ url_for('.view_settings',
-                namespace=repo.namespace,
-                username=username, repo=repo.name) }}" method="post">
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}" method="post">
             {% for key in repo.settings | sort %}
             {% if not config.get('ENABLE_TICKETS', True) and key in ['issue_tracker'] %}
             {% elif not config.get('DOC_APP_URL') and key in ['project_documentation'] %}
@@ -248,8 +259,10 @@
         </div>
         <div class="card-block">
           <form action="{{ url_for(
-              '.regenerate_git', namespace=repo.namespace,
-              username=username, repo=repo.name) }}" method="post"
+              '.regenerate_git',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace) }}" method="post"
                 class="icon">
             <input name="regenerate" value="tickets" type="hidden"/>
             <button class="btn btn-primary" type="submit"
@@ -259,8 +272,10 @@
             {{ form.csrf_token }}
           </form>
           <form class="m-t-2" action="{{ url_for(
-              '.regenerate_git', namespace=repo.namespace,
-              username=username, repo=repo.name) }}" method="post"
+              '.regenerate_git',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace) }}" method="post"
                 class="icon">
             <input name="regenerate" value="requests" type="hidden"/>
             <button class="btn btn-primary" type="submit"
@@ -285,15 +300,19 @@
 
           <p>
             <a href="{{ url_for(
-                  '.add_user', namespace=repo.namespace,
-                  username=username, repo=repo.name) }}"
+                  '.add_user',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace) }}"
                 class="btn btn-primary">
                 add user
             </a>
 
             <a href="{{ url_for(
-                  '.add_group_project', namespace=repo.namespace,
-                  username=username, repo=repo.name) }}"
+                  '.add_group_project',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace) }}"
                 class="btn btn-primary">
                 add group
             </a>
@@ -315,8 +334,11 @@
               </a>
               <form class="pull-xs-right" method="POST"
                 action="{{ url_for(
-                    '.remove_user', namespace=repo.namespace,
-                    username=username, repo=repo.name, userid=user.id) }}">
+                    '.remove_user',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    userid=user.id) }}">
                 <button
                   onclick="return confirm('You sure you want to remove this user from this project?');"
                   title="Remove user" class="btn btn-danger btn-sm">
@@ -334,8 +356,11 @@
               </a>
               <form class="pull-xs-right" method="POST"
                 action="{{ url_for(
-                    '.remove_group_project', namespace=repo.namespace,
-                    username=username, repo=repo.name, groupid=group.id) }}">
+                    '.remove_group_project',
+                    repo=repo.name,
+                    username=username,
+                    namespace=repo.namespace,
+                    groupid=group.id) }}">
                 <button
                   onclick="return confirm('You sure you want to remove this group from this project?');"
                   title="Remove group" class="btn btn-danger btn-sm pull-xs-right">
@@ -404,8 +429,10 @@
           </p>
         </div>
         <form action="{{ url_for(
-              '.update_priorities', namespace=repo.namespace,
-              username=username, repo=repo.name) }}"
+              '.update_priorities',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace) }}"
             method="post" class="icon">
           {{ tag_form.csrf_token }}
           <div class="card-block">
@@ -471,8 +498,10 @@
           </p>
         </div>
         <form action="{{ url_for(
-              '.update_milestones', namespace=repo.namespace,
-              username=username, repo=repo.name) }}"
+              '.update_milestones',
+              repo=repo.name,
+              username=username,
+              namespace=repo.namespace) }}"
             method="post" class="icon">
           {{ tag_form.csrf_token }}
           <div class="card-block">
@@ -533,15 +562,20 @@
         {% for tag in tags %}
           <li class="list-group-item clearfix">
             <a href="{{ url_for(
-                'view_issues', namespace=repo.namespace, username=username,
-                repo=repo.name, tags=tag.tag) }}">
+                'view_issues',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace,
+                tags=tag.tag) }}">
               <span class="oi" data-glyph="tag"></span>&nbsp; {{ tag.tag }}
             </a>
             <div class="pull-xs-right">
             <form class="icon del_icon pull-xs-right" method="POST"
               action="{{ url_for(
-                'remove_tag', namespace=repo.namespace, username=username,
-                repo=repo.name) }}">
+                'remove_tag',
+                repo=repo.name,
+                username=username,
+                namespace=repo.namespace) }}">
               <input type="hidden" value="{{ tag.tag }}" name="tag" />
               {{ tag_form.csrf_token }}
               <button
@@ -551,8 +585,11 @@
               </button>
             </form>
             <a href="{{ url_for(
-                  '.edit_tag', namespace=repo.namespace, username=username,
-                  repo=repo.name, tag=tag.tag) }}">
+                  '.edit_tag',
+                  repo=repo.name,
+                  username=username,
+                  namespace=repo.namespace,
+                  tag=tag.tag) }}">
               <button class="btn btn-default btn-sm" title="Edit tag">
                 <span class="oi" data-glyph="pencil"></span>
               </button>
@@ -573,8 +610,10 @@
         </div>
         <div class="card-block">
         <form action="{{ url_for(
-            '.delete_repo', namespace=repo.namespace,
-            username=username, repo=repo.name) }}"
+            '.delete_repo',
+            repo=repo.name,
+            username=username,
+            namespace=repo.namespace) }}"
               method="post" class="icon">
           <button class="btn btn-danger" type="submit"
             onclick="return confirm('Are you sure to delete {{repo.name}}? \nThis is final and cannot be un-done.');"
@@ -621,8 +660,11 @@ $('#accordions').on('shown.bs.collapse', function (e) {
     return false;
   }
   var _url = "{{ url_for(
-    '.view_plugin', namespace=repo.namespace, repo=repo.name,
-    username=username, plugin='') }}";
+    '.view_plugin',
+    repo=repo.name,
+    username=username,
+    namespace=repo.namespace,
+    plugin='') }}";
   _url += _plugin + '/0';
   console.log(_url);
   $.ajax({
diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html
index 68d5c49..2ae88fe 100644
--- a/pagure/templates/user_requests.html
+++ b/pagure/templates/user_requests.html
@@ -51,9 +51,10 @@
                 <td class="stretch-table-column">
                   <a href="{{ url_for(
                       'request_pull',
+                      repo=request.project.name,
                       username=request.project.username if request.project.is_fork else None,
                       namespace=request.project.namespace,
-                      repo=request.project.name, requestid=request.id) }}">
+                      requestid=request.id) }}">
                     {{ request.title | noJS("img") | safe }}
                   </a>
                 </td>
@@ -64,9 +65,9 @@
                 <td class="nowrap">
                   <a href="{{ url_for(
                     'view_repo',
+                    repo=request.project.name,
                     username=request.project.username if request.project.is_fork else None,
-                    namespace=request.project.namespace,
-                    repo=request.project.name)}}">
+                    namespace=request.project.namespace) }}">
                     {{ request.project.username + '/' if request.project.is_fork }}
                     {{ request.project.namespace + '/' if request.project.namespace }}
                     {{ request.project.name }}