diff --git a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
index 704fe25203..7094d3ccc3 100644
--- a/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
+++ b/src/open_inwoner/accounts/templates/accounts/registration_necessary.html
@@ -3,6 +3,7 @@
 
 {% block content %}
 
+<div class="registration-grid">
 {% render_grid %}
     {% render_column span=9 %}
         {% render_card tinted=True  %}
@@ -11,5 +12,6 @@ <h1 class="h1">{% trans "Registratie voltooien" %}</h1><br>
         {% endrender_card %}
     {% endrender_column %}
 {% endrender_grid %}
+</div>
 
 {% endblock content %}
diff --git a/src/open_inwoner/accounts/templates/django_registration/registration_form.html b/src/open_inwoner/accounts/templates/django_registration/registration_form.html
index deb2a21166..3cf607e0c5 100644
--- a/src/open_inwoner/accounts/templates/django_registration/registration_form.html
+++ b/src/open_inwoner/accounts/templates/django_registration/registration_form.html
@@ -3,6 +3,7 @@
 
 {% block content %}
 
+<div class="registration-grid">
 {% render_grid %}
     {% render_column start=5 span=5 %}
         {% render_card direction='horizontal' tinted=True %}
@@ -23,5 +24,6 @@ <h1 class="h3">{% trans "Registreren met E-mail" %}</h1><br>
     {% endif %}
 
 {% endrender_grid %}
+</div>
 
 {% endblock content %}
diff --git a/src/open_inwoner/accounts/templates/registration/login.html b/src/open_inwoner/accounts/templates/registration/login.html
index d319bb6f6c..501d8d8b97 100644
--- a/src/open_inwoner/accounts/templates/registration/login.html
+++ b/src/open_inwoner/accounts/templates/registration/login.html
@@ -10,6 +10,7 @@
 
 
 {% block content %}
+    <div class="login-grid">
     {% render_grid %}
         {% render_column start=5 span=5 %}
             {% render_card %}
@@ -24,7 +25,7 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
                         {% link href='digid:login' text=_('Inloggen met DigiD') secondary=True icon='arrow_forward' extra_classes="link--digid" %}
                     {% endrender_card %}
 		{% endif %}
-			
+
                 {% get_solo 'mozilla_django_oidc_db.OpenIDConnectConfig' as oidc_config %}
                 {% get_solo 'configurations.SiteConfiguration' as site_config %}
                 {% if oidc_config.enabled %}
@@ -54,4 +55,5 @@ <h1 class="h1">{% trans 'Welkom' %}</h1>
             {% endrender_card %}
         {% endrender_column %}
     {% endrender_grid %}
+    </div>
 {% endblock content %}
diff --git a/src/open_inwoner/pdc/views.py b/src/open_inwoner/pdc/views.py
index 68be083cd0..5ddcfef7e7 100644
--- a/src/open_inwoner/pdc/views.py
+++ b/src/open_inwoner/pdc/views.py
@@ -60,7 +60,7 @@ def page_title(self):
     def get_context_data(self, **kwargs):
         config = SiteConfiguration.get_solo()
 
-        limit = 3 if self.request.user.is_authenticated else 4
+        limit = 4
         kwargs.update(categories=Category.objects.published().order_by("name")[:limit])
         kwargs.update(product_locations=ProductLocation.objects.all()[:1000])
         kwargs.update(
@@ -86,7 +86,7 @@ def get_context_data(self, **kwargs):
             and self.request.user.selected_themes.exists()
         ):
             kwargs.update(
-                categories=self.request.user.selected_themes.order_by("name")[:3]
+                categories=self.request.user.selected_themes.order_by("name")[:limit]
             )
         elif highlighted_categories:
             kwargs.update(categories=highlighted_categories)
diff --git a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
index 5f556a6f3b..7afed236f1 100644
--- a/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
+++ b/src/open_inwoner/scss/components/CardContainer/CardContainer.scss
@@ -31,3 +31,12 @@
 .card-container + h2 {
   margin-top: var(--gutter-width);
 }
+
+/// Exceptions for forms inside cards
+
+.registration-grid,
+.login-grid {
+  .card {
+    max-width: 100%;
+  }
+}
diff --git a/src/open_inwoner/scss/components/Header/AnchorMenu.scss b/src/open_inwoner/scss/components/Header/AnchorMenu.scss
index 417d0b26ed..4ee3888b7f 100644
--- a/src/open_inwoner/scss/components/Header/AnchorMenu.scss
+++ b/src/open_inwoner/scss/components/Header/AnchorMenu.scss
@@ -17,7 +17,7 @@
   width: 100%;
   list-style: none;
   margin: 0;
-  padding: 0;
+  padding: var(--spacing-extra-large);
   z-index: 1002;
 
   &--desktop {
@@ -62,11 +62,13 @@
 
   .link {
     box-sizing: border-box;
-    padding: var(--spacing-large);
+    padding: var(--spacing-medium) var(--spacing-large) var(--spacing-medium)
+      var(--spacing-large);
 
     @media (min-width: 768px) {
       border-left: var(--border-width) solid;
       border-color: var(--color-gray-light);
+      padding: var(--spacing-large);
     }
   }
 
@@ -80,7 +82,8 @@
 
   &--mobile__title {
     box-sizing: border-box;
-    padding: var(--spacing-large);
+    padding: var(--spacing-large) var(--spacing-large) var(--spacing-medium)
+      var(--spacing-large);
 
     &.h4 {
       color: var(--color-primary);
diff --git a/src/open_inwoner/scss/views/Categories.scss b/src/open_inwoner/scss/views/Categories.scss
new file mode 100644
index 0000000000..90f6391bc1
--- /dev/null
+++ b/src/open_inwoner/scss/views/Categories.scss
@@ -0,0 +1,24 @@
+.categories {
+  &__content {
+    .card-container {
+      grid-template-columns: repeat(auto-fit, 228px);
+
+      .card {
+        max-width: 360px;
+      }
+    }
+  }
+
+  &__products {
+    margin-top: var(--gutter-width);
+
+    .card-container {
+      margin-top: var(--gutter-width);
+      grid-template-columns: repeat(var(--card-columns), 1fr);
+
+      .card {
+        max-width: 100%;
+      }
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/views/Home.scss b/src/open_inwoner/scss/views/Home.scss
new file mode 100644
index 0000000000..4ae6361473
--- /dev/null
+++ b/src/open_inwoner/scss/views/Home.scss
@@ -0,0 +1,11 @@
+/// Cards on Home Page and Theme page
+
+.home {
+  .card-container {
+    grid-template-columns: repeat(auto-fit, 228px);
+
+    .card {
+      max-width: 360px;
+    }
+  }
+}
diff --git a/src/open_inwoner/scss/views/_index.scss b/src/open_inwoner/scss/views/_index.scss
index 51b490f1b6..15b4cba304 100644
--- a/src/open_inwoner/scss/views/_index.scss
+++ b/src/open_inwoner/scss/views/_index.scss
@@ -1,5 +1,7 @@
 @import './App.scss';
 @import './body';
+@import './Categories.scss';
+@import './Home.scss';
 @import './Plans.scss';
 @import './product_detail';
 @import './view';
diff --git a/src/open_inwoner/templates/pages/category/detail.html b/src/open_inwoner/templates/pages/category/detail.html
index d53218cc78..5404a6c932 100644
--- a/src/open_inwoner/templates/pages/category/detail.html
+++ b/src/open_inwoner/templates/pages/category/detail.html
@@ -10,39 +10,43 @@
 {% endblock header_image %}
 
 {% block content %}
-    <h1 class="h1">
-        {{ object.name }}
-        {% if request.user.is_staff %}
-            {% button icon="edit" text=_("Open in admin") hide_text=True href="admin:pdc_category_change" object_id=object.pk %}
-        {% endif %}
-    </h1>
-    <p class="p">{{ object.description|linebreaksbr }}</p>
+    <div class="categories__content">
+        <h1 class="h1">
+            {{ object.name }}
+            {% if request.user.is_staff %}
+                {% button icon="edit" text=_("Open in admin") hide_text=True href="admin:pdc_category_change" object_id=object.pk %}
+            {% endif %}
+        </h1>
+        <p class="p">{{ object.description|linebreaksbr }}</p>
 
-    {% if subcategories %}
-        {% card_container subcategories=subcategories parent_category=object %}
-    {% endif %}
+        {% if subcategories %}
+            {% card_container subcategories=subcategories parent_category=object %}
+        {% endif %}
 
-    {% if products %}
-        {% card_container products=products small=True parent=object %}
-    {% endif %}
+        {% if products %}
+            <div class="categories__products">
+            {% card_container products=products small=True parent=object %}
+            </div>
+        {% endif %}
 
-    {% if category.question_set.all %}
-        {% render_grid %}
-            {% render_column span=6 %}
-                {% faq category.question_set.all %}
-            {% endrender_column %}
-        {% endrender_grid %}
-    {% endif %}
+        {% if category.question_set.all %}
+            {% render_grid %}
+                {% render_column span=6 %}
+                    {% faq category.question_set.all %}
+                {% endrender_column %}
+            {% endrender_grid %}
+        {% endif %}
 
-    {% if questionnaire_roots %}
-        <div class="grid">
-            <div class="column column--start-1 column--span-6 ">
-                <aside class="questionnaire">
-                    <h2 class="h2">{{configurable_text.questionnaire_page.select_questionnaire_title}}</h2>
-                    {% optional_paragraph configurable_text.questionnaire_page.select_questionnaire_intro %}
-                    {% questionnaire root_nodes=questionnaire_roots %}
-                </aside>
+        {% if questionnaire_roots %}
+            <div class="grid">
+                <div class="column column--start-1 column--span-6 ">
+                    <aside class="questionnaire">
+                        <h2 class="h2">{{configurable_text.questionnaire_page.select_questionnaire_title}}</h2>
+                        {% optional_paragraph configurable_text.questionnaire_page.select_questionnaire_intro %}
+                        {% questionnaire root_nodes=questionnaire_roots %}
+                    </aside>
+                </div>
             </div>
-        </div>
-    {% endif %}
+        {% endif %}
+    </div>
 {% endblock content %}
diff --git a/src/open_inwoner/templates/pages/category/list.html b/src/open_inwoner/templates/pages/category/list.html
index 212d9422e1..03f6d0f2ef 100644
--- a/src/open_inwoner/templates/pages/category/list.html
+++ b/src/open_inwoner/templates/pages/category/list.html
@@ -2,8 +2,10 @@
 {% load card_tags %}
 
 {% block content %}
-<h1 class="h1">{{configurable_text.theme_page.theme_title}}</h1>
-<p class="p">{{configurable_text.theme_page.theme_intro|linebreaksbr}}</p>
+<div class="categories__content">
+    <h1 class="h1">{{configurable_text.theme_page.theme_title}}</h1>
+    <p class="p">{{configurable_text.theme_page.theme_intro|linebreaksbr}}</p>
 
-{% card_container categories=object_list %}
+    {% card_container categories=object_list %}
+</div>
 {% endblock content %}
diff --git a/src/open_inwoner/templates/pages/home.html b/src/open_inwoner/templates/pages/home.html
index 8ab2a73d45..95c30efd82 100644
--- a/src/open_inwoner/templates/pages/home.html
+++ b/src/open_inwoner/templates/pages/home.html
@@ -8,6 +8,7 @@
 {% endblock header_image %}
 
 {% block content %}
+    <div class="home">
     {% block user_content %}
         <div class="grid__welcome">
             <h1 class="h1">{{configurable_text.home_page.home_welcome_title}}</h1>
@@ -24,7 +25,7 @@ <h2 class="h2">
     <p class="p">{{configurable_text.home_page.home_theme_intro|linebreaksbr}}</p>
 
     {% if request.user.is_authenticated %}
-        {% card_container categories=categories columns=3 image_object_fit="cover" %}
+        {% card_container categories=categories columns=4 image_object_fit="cover" %}
     {% else %}
         {% card_container categories=categories image_object_fit="cover" %}
     {% endif %}
@@ -45,4 +46,5 @@ <h2 class="h2">{{configurable_text.home_page.home_map_title}}</h2>
     {% with centroid=product_locations.get_centroid %}
         {% map centroid.lat centroid.lng geojson_feature_collection=product_locations.get_geojson_feature_collection %}
     {% endwith %}
+    </div>
 {% endblock %}
diff --git a/src/open_inwoner/templates/pages/user-home.html b/src/open_inwoner/templates/pages/user-home.html
index c46d8c5b36..81fb35078b 100644
--- a/src/open_inwoner/templates/pages/user-home.html
+++ b/src/open_inwoner/templates/pages/user-home.html
@@ -14,7 +14,7 @@ <h2 class="h2">
         </h2>
 
         {% if plans %}
-        <div class="plans-cards card-container card-container--columns-3">
+        <div class="plans-cards card-container card-container--columns-4">
             {% for plan in plans %}
                 {% render_card image_object_fit="cover" %}
                     <h3 class="h3">{{ plan.title }}</h3>