diff --git a/apps/member/templates/member/add_members.html b/apps/member/templates/member/add_members.html
index 909e72b3..05aad9a4 100644
--- a/apps/member/templates/member/add_members.html
+++ b/apps/member/templates/member/add_members.html
@@ -4,10 +4,6 @@
 {% load i18n %}
 {% load pretty_money %}
 
-{% block profile_info %}
-{% include "member/club_info.html" %}
-{% endblock %}
-
 {% block profile_content %}
     {% if additional_fee_renewal %}
         <div class="alert alert-warning">
diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html
index b61d869c..c52760c3 100644
--- a/apps/member/templates/member/base.html
+++ b/apps/member/templates/member/base.html
@@ -11,24 +11,39 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <div class="row mt-4">
     <div class="col-xl-4">
         {% block profile_info %}
-        {% include "member/profile_info.html" %}
+            {% if user_object %}
+                {% include "member/includes/profile_info.html"  %}
+            {% elif club %}
+                {% include "member/includes/club_info.html" %}
+            {% elif note.club.weiclub %}
+                {% with club=note.club.weiclub %}
+                {% include "wei/weiclub_info.html" %}
+                {% endwith %}
+            {% elif note.club %}
+                {% with club=note.club %}
+                {% include "member/includes/club_info.html" %}
+                {% endwith %}
+            {% elif note.user %}
+                {% with user_object=note.user %}
+                {% include "member/includes/profile_info.html"  %}
+                {% endwith %}
+            {% endif %}
         {% endblock %}
     </div>
     <div class="col-xl-8">
         {% block profile_content %}
-        {% include "member/profile_tables.html" %}
         {% endblock %}
     </div>
 </div>
 {% endblock %}
 
 {% block extrajavascript %}
+{% if object %}
 <script>
-    {% if object %}
     function refreshHistory() {
         $("#history_list").load("{% url 'member:user_detail' pk=object.pk %} #history_list");
         $("#profile_infos").load("{% url 'member:user_detail' pk=object.pk %} #profile_infos");
     }
-    {% endif %}
 </script>
+{% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/apps/member/templates/member/club_alias.html b/apps/member/templates/member/club_alias.html
index 60e2bef0..e574e41d 100644
--- a/apps/member/templates/member/club_alias.html
+++ b/apps/member/templates/member/club_alias.html
@@ -1,4 +1,4 @@
-{% extends "member/club_detail.html" %}
+{% extends "member/base.html" %}
 {% load static django_tables2 i18n %}
 
 {% block profile_content %}
diff --git a/apps/member/templates/member/club_detail.html b/apps/member/templates/member/club_detail.html
index c3afee7b..c05b20ab 100644
--- a/apps/member/templates/member/club_detail.html
+++ b/apps/member/templates/member/club_detail.html
@@ -1,11 +1,47 @@
 {% extends "member/base.html" %}
-
-{% block profile_info %}
-{% include "member/club_info.html" %}
-{% endblock %}
+{% load render_table from django_tables2 %}
+{% load i18n perms %}
 
 {% block profile_content %}
-{% include "member/club_tables.html" %}
+{% if managers.data %}
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="font-weight-bold">
+            <i class="fa fa-users"></i> {% trans "Club managers" %}
+        </a>
+    </div>
+    {% render_table managers %}
+</div>
+
+<hr>
+{% endif %}
+
+{% if member_list.data %}
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
+            <i class="fa fa-users"></i> {% trans "Club members" %}
+        </a>
+    </div>
+    {% render_table member_list %}
+</div>
+
+<hr>
+{% endif %}
+
+{% if history_list.data %}
+<div class="card">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %}
+            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endif %}
 {% endblock %}
 
 {% block extrajavascript %}
diff --git a/apps/member/templates/member/club_members.html b/apps/member/templates/member/club_members.html
index 9faff271..075e3c75 100644
--- a/apps/member/templates/member/club_members.html
+++ b/apps/member/templates/member/club_members.html
@@ -2,10 +2,6 @@
 {% load i18n %}
 {% load render_table from django_tables2 %}
 
-{% block profile_info %}
-    {% include "member/club_info.html" %}
-{% endblock %}
-
 {% block profile_content %}
     <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
     <div class="form-group">
diff --git a/apps/member/templates/member/club_picture_update.html b/apps/member/templates/member/club_picture_update.html
deleted file mode 100644
index 358fdd6e..00000000
--- a/apps/member/templates/member/club_picture_update.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "member/club_detail.html" %}
-
-{% block profile_content%}
-{% include "member/picture_update.html" %}
-{% endblock%}
diff --git a/apps/member/templates/member/club_tables.html b/apps/member/templates/member/club_tables.html
deleted file mode 100644
index 063c00c5..00000000
--- a/apps/member/templates/member/club_tables.html
+++ /dev/null
@@ -1,42 +0,0 @@
-{% load render_table from django_tables2 %}
-{% load i18n %}
-{% load perms %}
-
-{% if managers.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="clubListHeading">
-            <a class="font-weight-bold">
-                <i class="fa fa-users"></i> {% trans "Club managers" %}
-            </a>
-        </div>
-        {% render_table managers %}
-    </div>
-
-    <hr>
-{% endif %}
-
-{% if member_list.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="clubListHeading">
-            <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
-                <i class="fa fa-users"></i> {% trans "Club members" %}
-            </a>
-        </div>
-        {% render_table member_list %}
-    </div>
-
-    <hr>
-{% endif %}
-
-{% if history_list.data %}
-    <div class="card">
-        <div class="card-header position-relative" id="historyListHeading">
-            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:club.note %} href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
-                <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-            </a>
-        </div>
-        <div id="history_list">
-            {% render_table history_list %}
-        </div>
-    </div>
-{% endif %}
diff --git a/apps/member/templates/member/club_info.html b/apps/member/templates/member/includes/club_info.html
similarity index 100%
rename from apps/member/templates/member/club_info.html
rename to apps/member/templates/member/includes/club_info.html
diff --git a/apps/member/templates/member/profile_info.html b/apps/member/templates/member/includes/profile_info.html
similarity index 100%
rename from apps/member/templates/member/profile_info.html
rename to apps/member/templates/member/includes/profile_info.html
diff --git a/apps/member/templates/member/manage_auth_tokens.html b/apps/member/templates/member/manage_auth_tokens.html
index 0103fbbb..259194ba 100644
--- a/apps/member/templates/member/manage_auth_tokens.html
+++ b/apps/member/templates/member/manage_auth_tokens.html
@@ -1,5 +1,5 @@
-{% extends "base.html" %}
-{% load i18n static pretty_money django_tables2 %}
+{% extends "member/base.html" %}
+{% load i18n %}
 
 {% block content %}
     <div class="alert alert-info">
diff --git a/apps/member/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html
index f0c43e47..daec4f53 100644
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@@ -1,95 +1,105 @@
+{% extends "member/base.html" %}
 {% load i18n crispy_forms_tags %}
+
 {% block profile_content %}
-<div class="text-center">
-<form method="post" enctype="multipart/form-data" id="formUpload">
-  {% csrf_token %}
-  {{ form |crispy }}
-</form>
-</div>
-<!-- MODAL TO CROP THE IMAGE -->
-<div class="modal fade" id="modalCrop">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-body">
-        <img src="" id="modal-image" style="max-width: 100%;">
-      </div>
-      <div class="modal-footer">
-        <div class="btn-group pull-left" role="group">
-          <button type="button" class="btn btn-default" id="js-zoom-in">
-            <span class="glyphicon glyphicon-zoom-in"></span>
-          </button>
-          <button type="button" class="btn btn-default js-zoom-out">
-            <span class="glyphicon glyphicon-zoom-out"></span>
-          </button>
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body">
+    <div class="text-center">
+      <form method="post" enctype="multipart/form-data" id="formUpload">
+        {% csrf_token %}
+        {{ form |crispy }}
+      </form>
+    </div>
+    <!-- MODAL TO CROP THE IMAGE -->
+    <div class="modal fade" id="modalCrop">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-body">
+            <img src="" id="modal-image" style="max-width: 100%;">
+          </div>
+          <div class="modal-footer">
+            <div class="btn-group pull-left" role="group">
+              <button type="button" class="btn btn-default" id="js-zoom-in">
+                <span class="glyphicon glyphicon-zoom-in"></span>
+              </button>
+              <button type="button" class="btn btn-default js-zoom-out">
+                <span class="glyphicon glyphicon-zoom-out"></span>
+              </button>
+            </div>
+            <button type="button" class="btn btn-default" data-dismiss="modal">Nevermind</button>
+            <button type="button" class="btn btn-primary js-crop-and-upload">Crop and upload</button>
+          </div>
         </div>
-        <button type="button" class="btn btn-default" data-dismiss="modal">Nevermind</button>
-        <button type="button" class="btn btn-primary js-crop-and-upload">Crop and upload</button>
       </div>
     </div>
   </div>
 </div>
 {% endblock %}
+
 {% block extracss %}
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
+<link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
 {% endblock %}
 
 {% block extrajavascript%}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/jquery-cropper@1.0.1/dist/jquery-cropper.min.js"></script>
-    <script>
-     $(function () {
+<script src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery-cropper@1.0.1/dist/jquery-cropper.min.js"></script>
+<script>
+  $(function () {
 
-         /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
-         $("#id_image").change(function (e) {
-             if (this.files && this.files[0]) {
-                 var reader = new FileReader();
-                 reader.onload = function (e) {
-                     $("#modal-image").attr("src", e.target.result);
-                     $("#modalCrop").modal("show");
-                 }
-                 reader.readAsDataURL(this.files[0]);
-             }
-         });
+    /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
+    $("#id_image").change(function (e) {
+      if (this.files && this.files[0]) {
+        var reader = new FileReader();
+        reader.onload = function (e) {
+          $("#modal-image").attr("src", e.target.result);
+          $("#modalCrop").modal("show");
+        }
+        reader.readAsDataURL(this.files[0]);
+      }
+    });
 
-         /* SCRIPTS TO HANDLE THE CROPPER BOX */
-         var $image = $("#modal-image");
-         var cropBoxData;
-         var canvasData;
-         $("#modalCrop").on("shown.bs.modal", function () {
-             $image.cropper({
-                 viewMode: 1,
-                 aspectRatio: 1/1,
-                 minCropBoxWidth: 200,
-                 minCropBoxHeight: 200,
-                 ready: function () {
-                     $image.cropper("setCanvasData", canvasData);
-                     $image.cropper("setCropBoxData", cropBoxData);
-                 }
-             });
-         }).on("hidden.bs.modal", function () {
-             cropBoxData = $image.cropper("getCropBoxData");
-             canvasData = $image.cropper("getCanvasData");
-             $image.cropper("destroy");
-         });
+    /* SCRIPTS TO HANDLE THE CROPPER BOX */
+    var $image = $("#modal-image");
+    var cropBoxData;
+    var canvasData;
+    $("#modalCrop").on("shown.bs.modal", function () {
+      $image.cropper({
+        viewMode: 1,
+        aspectRatio: 1 / 1,
+        minCropBoxWidth: 200,
+        minCropBoxHeight: 200,
+        ready: function () {
+          $image.cropper("setCanvasData", canvasData);
+          $image.cropper("setCropBoxData", cropBoxData);
+        }
+      });
+    }).on("hidden.bs.modal", function () {
+      cropBoxData = $image.cropper("getCropBoxData");
+      canvasData = $image.cropper("getCanvasData");
+      $image.cropper("destroy");
+    });
 
-         $(".js-zoom-in").click(function () {
-             $image.cropper("zoom", 0.1);
-         });
+    $(".js-zoom-in").click(function () {
+      $image.cropper("zoom", 0.1);
+    });
 
-         $(".js-zoom-out").click(function () {
-             $image.cropper("zoom", -0.1);
-         });
+    $(".js-zoom-out").click(function () {
+      $image.cropper("zoom", -0.1);
+    });
 
-         /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */
-         $(".js-crop-and-upload").click(function () {
-             var cropData = $image.cropper("getData");
-             $("#id_x").val(cropData["x"]);
-             $("#id_y").val(cropData["y"]);
-             $("#id_height").val(cropData["height"]);
-             $("#id_width").val(cropData["width"]);
-             $("#formUpload").submit();
-         });
+    /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */
+    $(".js-crop-and-upload").click(function () {
+      var cropData = $image.cropper("getData");
+      $("#id_x").val(cropData["x"]);
+      $("#id_y").val(cropData["y"]);
+      $("#id_height").val(cropData["height"]);
+      $("#id_width").val(cropData["width"]);
+      $("#formUpload").submit();
+    });
 
-     });
-    </script>
-{% endblock %}
+  });
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/member/templates/member/profile_alias.html b/apps/member/templates/member/profile_alias.html
index ee2369e4..e574e41d 100644
--- a/apps/member/templates/member/profile_alias.html
+++ b/apps/member/templates/member/profile_alias.html
@@ -1,4 +1,4 @@
-{% extends "member/profile_detail.html" %}
+{% extends "member/base.html" %}
 {% load static django_tables2 i18n %}
 
 {% block profile_content %}
diff --git a/apps/member/templates/member/profile_detail.html b/apps/member/templates/member/profile_detail.html
index 9df28c9f..29d46bb1 100644
--- a/apps/member/templates/member/profile_detail.html
+++ b/apps/member/templates/member/profile_detail.html
@@ -1,4 +1,40 @@
 {% extends "member/base.html" %}
+{% load render_table from django_tables2 %}
+{% load i18n perms %}
+
+{% block profile_content %}
+{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
+<div class="alert alert-warning">
+    {% trans "This user doesn't have confirmed his/her e-mail address." %}
+    <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">
+        {% trans "Click here to resend a validation link." %}
+    </a>
+</div>
+{% endif %}
+
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <a class="font-weight-bold">
+            <i class="fa fa-users"></i> {% trans "View my memberships" %}
+        </a>
+    </div>
+    {% render_table club_list %}
+</div>
+
+<hr>
+
+<div class="card">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:user_object.note %}
+            href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endblock %}
 
 {% block extrajavascript %}
 <script>
diff --git a/apps/member/templates/member/profile_picture_update.html b/apps/member/templates/member/profile_picture_update.html
deleted file mode 100644
index c50a8299..00000000
--- a/apps/member/templates/member/profile_picture_update.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "member/profile_detail.html" %}
-
-{% block profile_content%}
-{% include "member/picture_update.html" %}
-{% endblock%}
diff --git a/apps/member/templates/member/profile_tables.html b/apps/member/templates/member/profile_tables.html
deleted file mode 100644
index 6c4cf662..00000000
--- a/apps/member/templates/member/profile_tables.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load render_table from django_tables2 %}
-{% load i18n %}
-{% load perms %}
-
-{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
-    <div class="alert alert-warning">
-        {% trans "This user doesn't have confirmed his/her e-mail address." %}
-        <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">{% trans "Click here to resend a validation link." %}</a>
-    </div>
-{% endif %}
-
-<div class="card">
-    <div class="card-header position-relative" id="clubListHeading">
-        <a class="font-weight-bold">
-            <i class="fa fa-users"></i> {% trans "View my memberships" %}
-        </a>
-    </div>
-    {% render_table club_list %}
-</div>
-
-<hr>
-
-<div class="card">
-    <div class="card-header position-relative" id="historyListHeading">
-            <a class="stretched-link font-weight-bold" {% if "note.view_note"|has_perm:user_object.note %} href="{% url 'note:transactions' pk=user_object.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>
diff --git a/apps/member/templates/member/profile_update.html b/apps/member/templates/member/profile_update.html
index 19d97189..480da954 100644
--- a/apps/member/templates/member/profile_update.html
+++ b/apps/member/templates/member/profile_update.html
@@ -1,11 +1,11 @@
-{% extends "base.html" %}
+{% extends "member/base.html" %}
 {% load i18n crispy_forms_tags %}
 {% comment %}
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% block contenttitle %}{% endblock %}
 
-{% block content %}
+{% block profile_content %}
 <div class="card bg-light">
     <h3 class="card-header text-center">
         {{ title }}
diff --git a/apps/member/views.py b/apps/member/views.py
index 267ae658..e7dc9925 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -273,7 +273,7 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
 
 class ProfilePictureUpdateView(PictureUpdateView):
     model = User
-    template_name = 'member/profile_picture_update.html'
+    template_name = 'member/picture_update.html'
     context_object_name = 'user_object'
 
 
@@ -452,7 +452,7 @@ class ClubPictureUpdateView(PictureUpdateView):
     Update the profile picture of a club.
     """
     model = Club
-    template_name = 'member/club_picture_update.html'
+    template_name = 'member/picture_update.html'
     context_object_name = 'club'
 
     def get_success_url(self):
diff --git a/apps/note/templates/note/search_transactions.html b/apps/note/templates/note/search_transactions.html
index 2364a0b3..f6a3d1d0 100644
--- a/apps/note/templates/note/search_transactions.html
+++ b/apps/note/templates/note/search_transactions.html
@@ -2,22 +2,6 @@
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
 
-{% block profile_info %}
-    {% if note.club.weiclub %}
-        {% with club=note.club.weiclub %}
-            {% include "wei/weiclub_info.html" %}
-        {% endwith %}
-    {% elif note.club %}
-        {% with club=note.club %}
-            {% include "member/club_info.html" %}
-        {% endwith %}
-    {% elif note.user %}
-        {% with user_object=note.user %}
-            {% include "member/profile_info.html"  %}
-        {% endwith %}
-    {% endif %}
-{% endblock %}
-
 {% block profile_content %}
     {% crispy form %}
 {% endblock %}
diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py
index 45365bbd..df5fc068 100644
--- a/note_kfet/inputs.py
+++ b/note_kfet/inputs.py
@@ -21,7 +21,7 @@ class AmountInput(NumberInput):
 
 
 class Autocomplete(TextInput):
-    template_name = "member/autocomplete_model.html"
+    template_name = "autocomplete_model.html"
 
     def __init__(self, model, resetable=False, attrs=None):
         super().__init__(attrs)
diff --git a/apps/member/templates/member/autocomplete_model.html b/note_kfet/templates/autocomplete_model.html
similarity index 100%
rename from apps/member/templates/member/autocomplete_model.html
rename to note_kfet/templates/autocomplete_model.html