diff --git a/RIGS/templates/base_rigs.html b/RIGS/templates/base_rigs.html
index 8c75a17e..609d923e 100644
--- a/RIGS/templates/base_rigs.html
+++ b/RIGS/templates/base_rigs.html
@@ -72,9 +72,12 @@
         <a href="{% url 'search_help' %}" class="nav-link modal-href btn-sm"><span class="fas fa-question-circle"></span></a>
     </form>
 {% endif %}
-{% include 'partials/navbar_user.html' %}
-</li>
 {% endblock %}
+
+{% block titleelements_right %}
+{% include 'partials/navbar_user.html' %}
+{% endblock %}
+
 {% block js %}
 <script src="{% static 'js/tooltip.js' %}"></script>
 <script src="{% static 'js/popover.js' %}"></script>
diff --git a/assets/templates/base_assets.html b/assets/templates/base_assets.html
index 91413433..8d34c766 100644
--- a/assets/templates/base_assets.html
+++ b/assets/templates/base_assets.html
@@ -37,5 +37,8 @@
     <li class="nav-item"><a class="nav-link" href="{% url 'asset_activity_table' %}">Recent Changes</a></li>
     <li class="nav-item"><a class="nav-link" href="{% url 'asset_audit_list' %}">Audit</a></li>
 {% endif %}
+{% endblock %}
+
+{% block titleelements_right %}
 {% include 'partials/navbar_user.html' %}
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 8541ba1b..e44703bb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,10 +52,14 @@
       <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
-        <ul class="navbar-nav mr-auto">
+        <ul class="navbar-nav">
             {% block titleelements %}
             {% endblock %}
         </ul>
+        <ul class="navbar-nav ml-auto">
+            {% block titleelements_right %}
+            {% endblock %}
+        </ul>
       </div>
   </div>
 </nav>