diff --git a/src/servala/frontend/templates/account/login.html b/src/servala/frontend/templates/account/login.html
index 6494b6a..3100278 100644
--- a/src/servala/frontend/templates/account/login.html
+++ b/src/servala/frontend/templates/account/login.html
@@ -6,40 +6,48 @@
         {% translate "Sign In" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block card_content %}
-    {% if SOCIALACCOUNT_ENABLED %}
-        {% get_providers as socialaccount_providers %}
-        {% if socialaccount_providers %}
-            {% for provider in socialaccount_providers %}
-                {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
-                <form method="post" action="{{ href }}">
-                    {% csrf_token %}
-                    <button href="{{ href }}"
-                            class="btn btn-warning btn-lg icon icon-left"
-                            title="{{ provider.name }}">
-                        <img src="{% static 'img/keycloak.svg' %}" style="height: 30px">
-                        <span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span>
-                    </button>
-                </form>
-            {% endfor %}
-        {% endif %}
-    {% endif %}
-    <div class="mt-2">
-        <a data-bs-toggle="collapse"
-           href="#login-form"
-           role="button"
-           aria-controls="login-form"
-           class="d-flex align-items-center">
-            <i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i>
-            {% translate "Log in with email and password instead" %}
-        </a>
-        <div class="collapse mt-3 ms-3"
-             id="login-form"
-             class="form form-vertical"
-             style="max-width: 400px">
-            {% url 'account_login' as form_action %}
-            {% translate "Sign In" as form_submit_label %}
-            {% include "includes/form.html" %}
+{% block content %}
+    <section class="section">
+        <div class="card">
+            <div class="card-content">
+                <div class="card-body">
+                    {% if SOCIALACCOUNT_ENABLED %}
+                        {% get_providers as socialaccount_providers %}
+                        {% if socialaccount_providers %}
+                            {% for provider in socialaccount_providers %}
+                                {% provider_login_url provider process=process scope=scope auth_params=auth_params as href %}
+                                <form method="post" action="{{ href }}">
+                                    {% csrf_token %}
+                                    <button href="{{ href }}"
+                                            class="btn btn-warning btn-lg icon icon-left"
+                                            title="{{ provider.name }}">
+                                        <img src="{% static 'img/keycloak.svg' %}" style="height: 30px">
+                                        <span class="mx-1">{% translate "Sign in with your" %} {{ provider.name }}</span>
+                                    </button>
+                                </form>
+                            {% endfor %}
+                        {% endif %}
+                    {% endif %}
+                    <div class="mt-2">
+                        <a data-bs-toggle="collapse"
+                           href="#login-form"
+                           role="button"
+                           aria-controls="login-form"
+                           class="d-flex align-items-center">
+                            <i class="bi bi-chevron-right me-2 ms-1 mb-2 collapse-icon"></i>
+                            {% translate "Log in with email and password instead" %}
+                        </a>
+                        <div class="collapse mt-3 ms-3"
+                             id="login-form"
+                             class="form form-vertical"
+                             style="max-width: 400px">
+                            {% url 'account_login' as form_action %}
+                            {% translate "Sign In" as form_submit_label %}
+                            {% include "includes/form.html" %}
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
-    </div>
+    </section>
 {% endblock content %}
diff --git a/src/servala/frontend/templates/frontend/base.html b/src/servala/frontend/templates/frontend/base.html
index 80dd44e..ab724f8 100644
--- a/src/servala/frontend/templates/frontend/base.html
+++ b/src/servala/frontend/templates/frontend/base.html
@@ -32,17 +32,6 @@
                     {% include "includes/message.html" %}
                 {% endfor %}
                 {% block content %}
-                    <section class="section">
-                        <div class="card">
-                            {% block card_header %}{% endblock %}
-                            <div class="card-content">
-                                <div class="card-body">
-                                    {% block card_content %}
-                                    {% endblock card_content %}
-                                </div>
-                            </div>
-                        </div>
-                    </section>
                 {% endblock content %}
             </div>
             <footer>
diff --git a/src/servala/frontend/templates/frontend/organizations/create.html b/src/servala/frontend/templates/frontend/organizations/create.html
index 2d7cfa4..ca46190 100644
--- a/src/servala/frontend/templates/frontend/organizations/create.html
+++ b/src/servala/frontend/templates/frontend/organizations/create.html
@@ -5,6 +5,12 @@
         {% translate "Create a new organization" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block card_content %}
-    {% include "includes/form.html" %}
-{% endblock card_content %}
+{% block content %}
+    <section class="section">
+        <div class="card">
+            <div class="card-content">
+                <div class="card-body">{% include "includes/form.html" %}</div>
+            </div>
+        </div>
+    </section>
+{% endblock content %}
diff --git a/src/servala/frontend/templates/frontend/profile.html b/src/servala/frontend/templates/frontend/profile.html
index 3188a91..a5f0e62 100644
--- a/src/servala/frontend/templates/frontend/profile.html
+++ b/src/servala/frontend/templates/frontend/profile.html
@@ -5,33 +5,39 @@
         {% translate "Profile" %}
     {% endblock page_title %}
 {% endblock html_title %}
-{% block card_header %}
-    <div class="card-header">
-        <h4 class="card-title">{% translate "Account" %}</h4>
-    </div>
-{% endblock %}
-{% block card_content %}
-    <p>
-        {% blocktranslate trimmed %}
-            You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
-        {% endblocktranslate %}
-    </p>
-    <div class="table-responsive">
-        <table class="table table-lg">
-            <tbody>
-                <tr>
-                    <th>{% translate "E-mail" %}</th>
-                    <td>{{ request.user.email }}</td>
-                </tr>
-                <tr>
-                    <th>{% translate "First name" %}</th>
-                    <td>{{ request.user.first_name }}</td>
-                </tr>
-                <tr>
-                    <th>{% translate "Last name" %}</th>
-                    <td>{{ request.user.last_name }}</td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
+{% block content %}
+    <section class="section">
+        <div class="card">
+            <div class="card-header">
+                <h4 class="card-title">{% translate "Account" %}</h4>
+            </div>
+            <div class="card-content">
+                <div class="card-body">
+                    <p class="card-text">
+                        {% blocktranslate trimmed %}
+                            You are logged in with your VSHN user account. You will be able to change your password and other settings here in the future.
+                        {% endblocktranslate %}
+                    </p>
+                    <div class="table-responsive">
+                        <table class="table table-lg">
+                            <tbody>
+                                <tr>
+                                    <th>{% translate "E-mail" %}</th>
+                                    <td>{{ request.user.email }}</td>
+                                </tr>
+                                <tr>
+                                    <th>{% translate "First name" %}</th>
+                                    <td>{{ request.user.first_name }}</td>
+                                </tr>
+                                <tr>
+                                    <th>{% translate "Last name" %}</th>
+                                    <td>{{ request.user.last_name }}</td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
 {% endblock content %}
diff --git a/src/servala/frontend/templates/socialaccount/signup.html b/src/servala/frontend/templates/socialaccount/signup.html
deleted file mode 100644
index ccc0f4c..0000000
--- a/src/servala/frontend/templates/socialaccount/signup.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "frontend/base.html" %}
-{% load i18n %}
-{% block html_title %}
-    {% block page_title %}
-        {% translate "Sign Up" %}
-    {% endblock page_title %}
-{% endblock html_title %}
-{% block card_content %}
-    <p>
-        {% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to
-{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}
-    </p>
-    {% url 'socialaccount_signup' as form_action %}
-    {% translate "Sign Up" as form_submit_label %}
-    <div style="max-width: 300px">{% include "includes/form.html" %}</div>
-{% endblock card_content %}