diff --git a/core/static/core/navbar.scss b/core/static/core/navbar.scss
index 7b0caa06..311825d9 100644
--- a/core/static/core/navbar.scss
+++ b/core/static/core/navbar.scss
@@ -59,10 +59,6 @@ nav.navbar {
         height: auto;
         justify-content: flex-start;
 
-        &:first-child {
-          border-radius: .6em .6em 0 0;
-        }
-
         &:last-child {
           border-radius: 0 0 .6em .6em;
 
diff --git a/core/static/sas/album.scss b/core/static/sas/album.scss
index b84d0dd3..7b744183 100644
--- a/core/static/sas/album.scss
+++ b/core/static/sas/album.scss
@@ -3,7 +3,7 @@ main {
   padding: 10px;
 }
 
-.navbar {
+.album-navbar {
   margin-top: 10px;
   display: flex;
   flex-direction: row;
diff --git a/core/static/user/user_detail.scss b/core/static/user/user_detail.scss
index 4f67c6f6..3b32a327 100644
--- a/core/static/user/user_detail.scss
+++ b/core/static/user/user_detail.scss
@@ -180,6 +180,7 @@ main {
         max-height: calc(100% / 3);
         width: 100%;
         object-fit: contain;
+        cursor: pointer;
 
         @media (max-width: 960px) {
           max-height: 100%;
diff --git a/core/static/user/user_godfathers.scss b/core/static/user/user_godfathers.scss
index e600ec1b..e49e63c9 100644
--- a/core/static/user/user_godfathers.scss
+++ b/core/static/user/user_godfathers.scss
@@ -69,7 +69,7 @@
         
             @media (max-width: 375px) {
               max-width: 100%;
-              max-height: 80px;
+              max-height: 65px;
             }
           }
         }
diff --git a/core/templates/core/user_detail.jinja b/core/templates/core/user_detail.jinja
index 5a2300d1..5cc24de0 100644
--- a/core/templates/core/user_detail.jinja
+++ b/core/templates/core/user_detail.jinja
@@ -99,7 +99,7 @@
             </div>
             <!-- Pictures -->
             <div class="user_profile_pictures">
-                <div class="user_profile_pictures_bigone">
+                <div class="user_profile_pictures_bigone" id="big_picture">
                     {% if profile.profile_pict %}
                     <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
                         title="{% trans %}Profile{% endtrans %}" />
@@ -108,7 +108,7 @@
                         title="{% trans %}Profile{% endtrans %}" />
                     {% endif %}
                 </div>
-                <div class="user_profile_pictures_thumbnails">
+                <div class="user_profile_pictures_thumbnails" id="small_pictures">
                     {% if profile.profile_pict %}
                     <img src="{{ profile.profile_pict.get_download_url() }}" alt="{% trans %}Profile{% endtrans %}"
                         title="{% trans %}Profile{% endtrans %}" />
@@ -136,104 +136,103 @@
             </div>
         </div>
     </main>
-    {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user ==
-    profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %}
-    {# if the user is member of a club, he can view the subscription state #}
-    <hr>
-    {% if profile.is_subscribed %}
-    {% if user == profile or user.is_root or user.is_board_member %}
-    <div>
-        {{ user_subscription(profile) }}
-    </div>
-    {% endif %}
-    {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
-    <div>
-        {# Shows tokens bought by the user #}
-        {{ show_tokens(profile) }}
-        {# Shows slots took by the user #}
-        {{ show_slots(profile) }}
-    </div>
-    {% endif %}
-    {% else %}
-    <div>
-        {% trans %}Not subscribed{% endtrans %}
-        {% if user.is_board_member %}
-        <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans
-            %}</a>
-        {% endif %}
-        {% endif %}
-    </div>
-    {% endif %}
-    {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
-        <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
-            <div class="collapse-header clickable" @click="collapsed = !collapsed">
-                <span class="collapse-header-text">
-                    {% trans %}Subscription history{% endtrans %}
-                </span>
-                <span class="collapse-header-icon" :class="{'reverse': collapsed}">
-                    <i class="fa fa-caret-down"></i>
-                </span>
+    {% if user.memberships.filter(end_date=None).exists() or user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user == profile or user.is_in_group(settings.SITH_BAR_MANAGER_BOARD_GROUP) %}
+        {# if the user is member of a club, he can view the subscription state #}
+        <hr>
+        {% if profile.is_subscribed %}
+            {% if user == profile or user.is_root or user.is_board_member %}
+                <div>
+                    {{ user_subscription(profile) }}
+                </div>
+            {% endif %}
+            {% if user == profile or user.is_root or user.is_board_member or user.is_launderette_manager %}
+                <div>
+                    {# Shows tokens bought by the user #}
+                    {{ show_tokens(profile) }}
+                    {# Shows slots took by the user #}
+                    {{ show_slots(profile) }}
+                </div>
+            {% endif %}
+        {% else %}
+            <div>
+                {% trans %}Not subscribed{% endtrans %}
+                {% if user.is_board_member %}
+                <a href="{{ url('subscription:subscription') }}?member={{ profile.id }}">{% trans %}New subscription{% endtrans
+                    %}</a>
+                {% endif %}
+                {% endif %}
             </div>
-            <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
-                <table>
-                    <thead>
-                        <tr>
-                            <th>{% trans %}Subscription start{% endtrans %}</th>
-                            <th>{% trans %}Subscription end{% endtrans %}</th>
-                            <th>{% trans %}Subscription type{% endtrans %}</th>
-                            <th>{% trans %}Payment method{% endtrans %}</th>
-                        </tr>
-                    </thead>
-                    {% for sub in profile.subscriptions.all() %}
-                    <tr>
-                        <td>{{ sub.subscription_start }}</td>
-                        <td>{{ sub.subscription_end }}</td>
-                        <td>{{ sub.subscription_type }}</td>
-                        <td>{{ sub.get_payment_method_display() }}</td>
-                    </tr>
-                    {% endfor %}
-                </table>
-            </div>
-        </div>
-    {% endif %}
-
-    {% if user.is_root or user.is_board_member %}
-    <hr>
-    <div>
-        <form class="form-gifts" action="{{ url('core:user_gift_create', user_id=profile.id) }}" method="post">
-            {% csrf_token %}
-            {{ gift_form.label }}
-            {{ gift_form.user }}
-            <input type="submit" value="{% trans %}Give gift{% endtrans %}">
-        </form>
-        {% if profile.gifts.exists() %}
-            {% set gifts = profile.gifts.order_by("-date")|list %}
-            <br>
+        {% endif %}
+        <br>
+        {% if profile.was_subscribed and (user == profile or user.can_read_subscription_history)%}
             <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
                 <div class="collapse-header clickable" @click="collapsed = !collapsed">
                     <span class="collapse-header-text">
-                        {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
+                        {% trans %}Subscription history{% endtrans %}
                     </span>
                     <span class="collapse-header-icon" :class="{'reverse': collapsed}">
                         <i class="fa fa-caret-down"></i>
                     </span>
                 </div>
                 <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
-                    <ul>
-                    {% for gift in gifts %}
-                        <li>{{ gift }}
-                            <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">
-                                <i class="fa fa-trash"></i>
-                            </a>
-                        </li>
-                    {% endfor %}
-                </ul>
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>{% trans %}Subscription start{% endtrans %}</th>
+                                <th>{% trans %}Subscription end{% endtrans %}</th>
+                                <th>{% trans %}Subscription type{% endtrans %}</th>
+                                <th>{% trans %}Payment method{% endtrans %}</th>
+                            </tr>
+                        </thead>
+                        {% for sub in profile.subscriptions.all() %}
+                            <tr>
+                                <td>{{ sub.subscription_start }}</td>
+                                <td>{{ sub.subscription_end }}</td>
+                                <td>{{ sub.subscription_type }}</td>
+                                <td>{{ sub.get_payment_method_display() }}</td>
+                            </tr>
+                        {% endfor %}
+                    </table>
+                </div>
             </div>
-        </div>
-        {% else %}
-        <em>{% trans %}No gift given yet{% endtrans %}</em>
         {% endif %}
-    </div>
+
+        <hr>
+        <div>
+        {% if user.is_root or user.is_board_member %}
+            <form class="form-gifts" action="{{ url('core:user_gift_create', user_id=profile.id) }}" method="post">
+                {% csrf_token %}
+                {{ gift_form.label }}
+                {{ gift_form.user }}
+                <input type="submit" value="{% trans %}Give gift{% endtrans %}">
+            </form>
+            {% if profile.gifts.exists() %}
+                {% set gifts = profile.gifts.order_by("-date")|list %}
+                <br>
+                <div class="collapse" :class="{'shadow': collapsed}" x-data="{collapsed: false}" x-cloak>
+                    <div class="collapse-header clickable" @click="collapsed = !collapsed">
+                        <span class="collapse-header-text">
+                            {% trans %}Last given gift :{% endtrans %} {{ gifts[0] }}
+                        </span>
+                        <span class="collapse-header-icon" :class="{'reverse': collapsed}">
+                            <i class="fa fa-caret-down"></i>
+                        </span>
+                    </div>
+                    <div class="collapse-body" x-show="collapsed" x-transition.scale.origin.top>
+                        <ul>
+                        {% for gift in gifts %}
+                            <li>{{ gift }}
+                                <a href="{{ url('core:user_gift_delete', user_id=profile.id, gift_id=gift.id) }}">
+                                    <i class="fa fa-trash"></i>
+                                </a>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
+        {% else %}
+            <em>{% trans %}No gift given yet{% endtrans %}</em>
+        {% endif %}
+        </div>
     {% endif %}
 </div>
 
@@ -250,7 +249,7 @@
             keys.push(e.keyCode);
             if (keys.toString() == pattern) {
                 keys = [];
-                $("#user_profile_pictures_bigone img").attr("src", "{{ static('core/img/yug.jpg') }}");
+                $("#big_picture img").attr("src", "{{ static('core/img/yug.jpg') }}");
             }
             if (keys.length == 6) {
                 keys.shift();
@@ -258,10 +257,10 @@
         });
     });
     $(function () {
-        $("#user_profile_pictures_thumbnails img").click(function () {
-            $("#user_profile_pictures_bigone img").attr("src", $(this)[0].src);
-            $("#user_profile_pictures_bigone img").attr("alt", $(this)[0].alt);
-            $("#user_profile_pictures_bigone img").attr("title", $(this)[0].title);
+        $("#small_pictures img").click(function () {
+            $("#big_picture img").attr("src", $(this)[0].src);
+            $("#big_picture img").attr("alt", $(this)[0].alt);
+            $("#big_picture img").attr("title", $(this)[0].title);
         })
     });
     $(function () {
diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja
index ba98fc95..471aecda 100644
--- a/core/templates/core/user_pictures.jinja
+++ b/core/templates/core/user_pictures.jinja
@@ -21,7 +21,7 @@
                     <a href="{{ url("sas:picture", picture_id=p.id) }}#pict">
                         <div
                             class="photo{% if not p.is_moderated %} not_moderated{% endif %}"
-                            style="background-image: url('{% if p.file %}{{ p.get_download_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
+                            style="background-image: url('{% if p.file %}{{ p.get_download_thumb_url() }}{% else %}{{ static('core/img/sas.jpg') }}{% endif %}');"
                         >
                             {% if not p.is_moderated %}
                                 <div class="overlay">&nbsp;</div>
diff --git a/sas/templates/sas/album.jinja b/sas/templates/sas/album.jinja
index ca3f7804..0d3be6dd 100644
--- a/sas/templates/sas/album.jinja
+++ b/sas/templates/sas/album.jinja
@@ -29,7 +29,7 @@
         <form action="" method="post" enctype="multipart/form-data">
             {% csrf_token %}
 
-            <div class="navbar">
+            <div class="album-navbar">
                 <h3>{{ album.get_display_name() }}</h3>
 
                 <div class="toolbar">