diff --git a/config/settings.py b/config/settings.py
index 89f2afb665..8fa39401ee 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -47,7 +47,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = env('ALLOWED_HOSTS', default="localhost").split()
 
-
 # Application definition
 INSTALLED_APPS = [
     'django.contrib.admin',
diff --git a/templates/people/gymnasts/list_routine.html b/templates/people/gymnasts/list_routine.html
index 1d63c47eec..a6c00a55e2 100644
--- a/templates/people/gymnasts/list_routine.html
+++ b/templates/people/gymnasts/list_routine.html
@@ -41,11 +41,13 @@
                 {% endif %}
             </div>
                 <div class="card-footer text-right text-muted pt-0">
+                    {% if ghr_list %}
                     <a href="{% url 'routine_list_for_gymnast' gymnast_id %}">
                         <button type="submit" value="list" class="btn btn-icon btn-warning mr-2">
                             <i class="tim-icons icon-components"></i> <!-- Routines -->
                         </button>
                     </a>
+                    {% endif %}
 
                     {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %}
                         <a href="{% url 'link_routine_to_gymnast' gymnast_id %}">
@@ -100,7 +102,8 @@
                 {% endif %}
             </div>
             <div class="card-footer pt-0 row">
-                <div class="col-md-6">
+                {% if routine_done_list %}
+                <div class="col-md-6 text-muted pt-0">
                     <a href="#">
                         <button type="submit" value="list" class="btn btn-icon btn-success mr-2 action-button" data-routine_type="1" data-success="1">
                             +R1
@@ -122,13 +125,16 @@
                             +R2
                         </button>
                     </a>
+                    {% endif %}
                 </div>
-                <div class="col-md-6 text-right">
+                <div class="col-md-6 text-right text-muted pt-0">
+                    {% if routine_done_list %}
                     <a href="{% url 'routinedone_list_for_gymnast' gymnast_id %}">
                         <button type="submit" value="list" class="btn btn-icon btn-warning mr-2">
                             <i class="fal fa-chart-bar"></i>
                         </button>
                     </a>
+                    {% endif %}
 
                     {% if request.user|has_group:"Trainer" or request.user|is_user_equal_to_gymnast:gymnast_id %}
                         <a href="{% url 'routinedone_create_for_gymnast' gymnast_id %}">