diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html
index 5f057a2a..6568340b 100644
--- a/ihatemoney/templates/list_bills.html
+++ b/ihatemoney/templates/list_bills.html
@@ -94,6 +94,7 @@
 </ul>
 {% endif %}
 <span id="new-bill" class="ml-auto pb-2" {% if not g.project.members %} data-toggle="tooltip" title="{{_('You should start by adding participants')}}" {% endif %}>
+    <a href="{{ url_for('.list_bills_archived')}}"><button class="btn btn-primary" data-toggle="modal" data-keyboard="false">Go to Archive</button></a>
     <a href="{{ url_for('.add_bill') }}" class="btn btn-primary {% if not g.project.members %} disabled {% endif %}" data-toggle="modal" data-keyboard="false" data-target="#bill-form">
         <i class="icon icon-white before-text">{{ static_include("images/plus.svg") | safe }}</i>
         {{ _("Add a new bill") }}
@@ -176,5 +177,4 @@
             </div>
         </div></div>
     {% endif %}
-    <a href="{{ url_for('.list_bills_archived')}}">archived</a>
 {% endblock %}
diff --git a/ihatemoney/templates/list_bills_archived.html b/ihatemoney/templates/list_bills_archived.html
index 517778cc..f1081378 100644
--- a/ihatemoney/templates/list_bills_archived.html
+++ b/ihatemoney/templates/list_bills_archived.html
@@ -94,6 +94,7 @@
 </ul>
 {% endif %}
 <span id="new-bill" class="ml-auto pb-2" {% if not g.project.members %} data-toggle="tooltip" title="{{_('You should start by adding participants')}}" {% endif %}>
+    <a href="{{ url_for('.list_bills')}}"><button class="btn btn-primary" data-toggle="modal" data-keyboard="false">Go to Active Bills</button></a>
     <a href="{{ url_for('.add_bill') }}" class="btn btn-primary {% if not g.project.members %} disabled {% endif %}" data-toggle="modal" data-keyboard="false" data-target="#bill-form">
         <i class="icon icon-white before-text">{{ static_include("images/plus.svg") | safe }}</i>
         {{ _("Add a new bill") }}
@@ -145,7 +146,7 @@
                     </form>
                     <form action="{{ url_for(".archive_bill", bill_id=bill.id) }}" method="POST">
                         {{ csrf_form.csrf_token }}
-                        <button class="archive" type="submit" title="{{ _("archive") }}"></button>
+                        <button class="archive" type="submit" title="{{ _("unarchive") }}"></button>
                     </form>
                     {% if bill.external_link %}
                     <a class="show" href="{{ bill.external_link }}" ref="noopener" target="_blank" title="{{ _("show") }}">{{ _('show') }} </a>
@@ -176,5 +177,4 @@
             </div>
         </div></div>
     {% endif %}
-    <a href="{{ url_for('.list_bills')}}">not archived</a>
 {% endblock %}