diff --git a/requirements/base.txt b/requirements/base.txt
index c71ea5ce9b..b3065cbffd 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -195,7 +195,7 @@ django-js-asset==1.2.2
     #   django-mptt
 django-localflavor==3.1
     # via -r requirements/base.in
-django-log-outgoing-requests==0.4.0
+django-log-outgoing-requests==0.5.0
     # via -r requirements/base.in
 django-mptt==0.13.4
     # via django-filer
diff --git a/requirements/ci.txt b/requirements/ci.txt
index 12ff7fb46a..7d400ceb96 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -309,7 +309,7 @@ django-localflavor==3.1
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
-django-log-outgoing-requests==0.4.0
+django-log-outgoing-requests==0.5.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 9652e12f47..e98e665fb2 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -338,7 +338,7 @@ django-localflavor==3.1
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
-django-log-outgoing-requests==0.4.0
+django-log-outgoing-requests==0.5.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
diff --git a/src/open_inwoner/components/templates/components/Form/ChoiceRadio.html b/src/open_inwoner/components/templates/components/Form/ChoiceRadio.html
index 5bb90adc77..85c72a2357 100644
--- a/src/open_inwoner/components/templates/components/Form/ChoiceRadio.html
+++ b/src/open_inwoner/components/templates/components/Form/ChoiceRadio.html
@@ -1,6 +1,6 @@
 {% load l10n form_tags %}
 
-<label class="radio">
+<div class="radio">
     {% spaceless %}
     {% initial_match as checked %}
     <input
@@ -13,4 +13,4 @@
     />
     <label class="radio__label" for="id_{{ name }}_{{ index }}">{{ choice.1 }}</label>
     {% endspaceless %}
-</label>
+</div>
diff --git a/src/open_inwoner/components/templates/components/Form/Input.html b/src/open_inwoner/components/templates/components/Form/Input.html
index 81b25c573c..845f25f009 100644
--- a/src/open_inwoner/components/templates/components/Form/Input.html
+++ b/src/open_inwoner/components/templates/components/Form/Input.html
@@ -3,10 +3,10 @@
 <div class="form__control {{ extra_classes|default:"" }}">
     <label class="label {% if no_label %}label--gapless{% endif %}">
         {% if icon %}{% icon icon outlined=True %}{% endif %}
-        <label class="label__label {% if no_label %}label__label--hidden{% endif %}">
+        <span class="label__label {% if no_label %}label__label--hidden{% endif %}">
             {{ field.label }}
             {% if field.field.required %}<span class="label__label--required"> * </span>{% endif %}
-        </label>
+        </span>
         {{ field|addclass:"input" }}
         {% if field.help_text and not no_help %}
             <p class="p">{{ field.help_text }}</p>
diff --git a/src/open_inwoner/components/templates/components/Form/Label.html b/src/open_inwoner/components/templates/components/Form/Label.html
deleted file mode 100644
index 61b673eccd..0000000000
--- a/src/open_inwoner/components/templates/components/Form/Label.html
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, {ReactElement} from 'react';
-import './Label.scss';
-
-interface iLabelProps {
-  htmlFor?: string,
-  children?: any,
-  className?: string,
-}
-
-/**
- * Renders a label.
- * @param {iLabelProps} props
- * @return {ReactElement}
- */
-export function Label(props: iLabelProps): ReactElement {
-  const { children, htmlFor, className, ..._props } = props
-
-  const getClassNames = () => {
-    return `label ${className}`
-  }
-
-  return (
-    <label className={ getClassNames() } htmlFor={htmlFor} {..._props}>
-      {children}
-    </label>
-  );
-}
diff --git a/src/open_inwoner/components/templates/components/Header/Header.html b/src/open_inwoner/components/templates/components/Header/Header.html
index 5fcadc252f..f3a5b6135d 100644
--- a/src/open_inwoner/components/templates/components/Header/Header.html
+++ b/src/open_inwoner/components/templates/components/Header/Header.html
@@ -3,6 +3,7 @@
 {% get_solo "configurations.SiteConfiguration" as config %}
 
 {% accessibility_header request=request %}
+
 <header class="header" aria-label="Navigatie header">
     <div class="header__container">
         <div class="header__menu">
@@ -28,13 +29,15 @@
             <div class="header__submenu">
 
             {% if cms_apps.products %}
-            <nav class="header__actions" aria-label="Zoek navigatie mobiel">
-                {% url 'search:search' as search_url %}
-                {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=False %}
-                    {% input search_form.query no_label=True %}
-                    {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
-                {% endrender_form %}
-            </nav>
+            {% if request.user.is_authenticated or not config.hide_search_from_anonymous_users %}
+              <nav class="header__actions" aria-label="Zoek navigatie mobiel">
+                  {% url 'search:search' as search_url %}
+                  {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=False %}
+                      {% input search_form.query no_label=True %}
+                      {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
+                  {% endrender_form %}
+              </nav>
+            {% endif %}
             {% endif %}
 
                 <nav class="primary-navigation" aria-label="Hoofd navigatie">
@@ -45,25 +48,27 @@
                             {% link text=link_text href="/" icon="grid_view" icon_position="before" %}
                         </li>
 
-                        {% if cms_apps.products and categories %}
-                        <li class="primary-navigation__list-item dropdown-nav__toggle">
-                            <a href="#" class="link link--toggle link--icon link--icon-position-before" aria-label="{% trans "Onderwerpen" %}" title="{% trans "Onderwerpen" %}" aria-expanded="false">
-                                <span >{% trans "Onderwerpen" %}</span>
-                                <span aria-hidden="true" class="material-icons-outlined ">description</span>
-                                {% icon icon="expand_more" icon_position="after" icon_outlined=True %}
-                            </a>
-
-                            {% if categories %}
-                                <ul class="primary-navigation__list subpage-list">
-                                    {% for category in categories %}
-                                        <li class="primary-navigation__list-item">
-                                            {% url 'products:category_detail' slug=category.slug as category_href %}
-                                            {% link text=category.name href=category_href %}
-                                        </li>
-                                    {% endfor %}
-                                </ul>
+                        {% if cms_apps.products %}
+                            {% if request.user.is_authenticated or not config.hide_categories_from_anonymous_users %}
+                                <li class="primary-navigation__list-item dropdown-nav__toggle">
+                                    <a href="#" class="link link--toggle link--icon link--icon-position-before" aria-label="{% trans "Onderwerpen" %}" title="{% trans "Onderwerpen" %}" aria-expanded="false">
+                                        <span >{% trans "Onderwerpen" %}</span>
+                                        <span aria-hidden="true" class="material-icons-outlined ">description</span>
+                                        {% icon icon="expand_more" icon_position="after" icon_outlined=True %}
+                                    </a>
+
+                                    {% if menu_categories %}
+                                        <ul class="primary-navigation__list subpage-list">
+                                            {% for category in menu_categories %}
+                                                <li class="primary-navigation__list-item">
+                                                    {% url 'products:category_detail' slug=category.slug as category_href %}
+                                                    {% link text=category.name href=category_href %}
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                    {% endif %}
+                                </li>
                             {% endif %}
-                        </li>
                         {% endif %}
 
                         {% show_menu_below_id "home" 0 100 100 100 "cms/menu/primary.html" %}
@@ -103,30 +108,34 @@
     {% firstof config.logo.default_alt_text config.name as logo_alt_text %}
         <div class="logo__desktop">{% logo src=config.logo.file.url alt="Homepage "|add:logo_alt_text svg_height=75 %}</div>
 
-        {% primary_navigation categories=categories request=request has_general_faq_questions=has_general_faq_questions cms_apps=cms_apps show_plans=show_plans %}
+				{% include "components/Header/PrimaryNavigation.html" %}
 
         {% if cms_apps.products %}
-        <nav class="header__actions" aria-label="Zoek navigatie desktop">
-            {% url 'search:search' as search_url %}
-            {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=True %}
-                {% input search_form.query no_label=True %}
-                {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
-            {% endrender_form %}
-        </nav>
+          {% if request.user.is_authenticated or not config.hide_search_from_anonymous_users %}
+          <nav class="header__actions" aria-label="Zoek navigatie desktop">
+              {% url 'search:search' as search_url %}
+              {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=True %}
+                  {% input search_form.query no_label=True %}
+                  {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
+              {% endrender_form %}
+          </nav>
+          {% endif %}
         {% endif %}
 
-        {% navigation_authenticated categories=categories request=request has_general_faq_questions=has_general_faq_questions %}
+        {% include "components/Header/NavigationAuthenticated.html" %}
     </div>
 </header>
 
 {% if cms_apps.products %}
-<section class="search search__mobile">
-    <nav class="search__actions " aria-label="Zoek navigatie mobiel">
-        {% url 'search:search' as search_url %}
-        {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=False %}
-            {% input search_form.query no_label=True %}
-            {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
-        {% endrender_form %}
-    </nav>
-</section>
+    {% if request.user.is_authenticated or not config.hide_search_from_anonymous_users %}
+        <section class="search search__mobile">
+            <nav class="search__actions " aria-label="Zoek navigatie mobiel">
+                {% url 'search:search' as search_url %}
+                {% render_form form=search_form method="GET" form_action=search_url inline=True spaceless=False %}
+                    {% input search_form.query no_label=True %}
+                    {% form_actions primary_icon="search" primary_text=_("Zoeken") hide_primary_text=True %}
+                {% endrender_form %}
+            </nav>
+        </section>
+    {% endif %}
 {% endif %}
diff --git a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
index 53ede41b53..689377090a 100644
--- a/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
+++ b/src/open_inwoner/components/templates/components/Header/PrimaryNavigation.html
@@ -4,22 +4,21 @@
 
 <nav class="primary-navigation primary-navigation__main" aria-label="Hoofd navigatie">
     <ul class="primary-navigation__list">
-
         {% if cms_apps.products and categories %}
-        <li class="primary-navigation__list-item">
-            {% button text=_('Onderwerpen') type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
+            {% if request.user.is_authenticated or not config.hide_categories_from_anonymous_users %}
+                <li class="primary-navigation__list-item">
+                    {% button text=_('Onderwerpen') type="button" icon="expand_more" icon_position="after" icon_outlined=True transparent=True extra_classes="primary-navigation--toggle" %}
 
-            {% if categories %}
-                <ul class="primary-navigation__list subpage-list">
-                    {% for category in categories %}
-                        <li class="primary-navigation__list-item">
-                            {% url 'products:category_detail' slug=category.slug as category_href %}
-                            {% link text=category.name href=category_href %}
-                        </li>
-                    {% endfor %}
-                </ul>
+                    <ul class="primary-navigation__list subpage-list">
+                        {% for category in categories %}
+                            <li class="primary-navigation__list-item">
+                                {% url 'products:category_detail' slug=category.slug as category_href %}
+                                {% link text=category.name href=category_href %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </li>
             {% endif %}
-        </li>
         {% endif %}
     </ul>
 </nav>
diff --git a/src/open_inwoner/components/templatetags/header_tags.py b/src/open_inwoner/components/templatetags/header_tags.py
index f8eb87a5ba..553f32818b 100644
--- a/src/open_inwoner/components/templatetags/header_tags.py
+++ b/src/open_inwoner/components/templatetags/header_tags.py
@@ -1,7 +1,6 @@
 from django import template
 
 from open_inwoner.configurations.models import SiteConfiguration
-from open_inwoner.questionnaire.models import QuestionnaireStep
 
 register = template.Library()
 
@@ -38,51 +37,6 @@ def header(categories, request, **kwargs):
         + request: Request | the django request object.
         - has_general_faq_questions: boolean | If the FAQ menu item should be shown.
     """
-    return {
-        **kwargs,
-        "categories": categories,
-        "request": request,
-    }
-
-
-@register.inclusion_tag("components/Header/PrimaryNavigation.html")
-def primary_navigation(categories, request, **kwargs):
-    """
-    Displaying the primary navigation
-
-    Usage:
-        {% primary_navigation categories=Category.objects.all request=request %}
-
-    Variables:
-        + categories: Category[] | The categories that should be displayed in the theme dropdown.
-        + request: Request | The django request object.
-        + questionnaire: QuestionnaireStep | The default QuestionnaireStep, if any.
-        - has_general_faq_questions: boolean | If the FAQ menu item should be shown.
-        - show_plans: boolean | If the Plan item should be shown.
-    """
-
-    return {
-        **kwargs,
-        "categories": categories,
-        "request": request,
-    }
-
-
-@register.inclusion_tag("components/Header/NavigationAuthenticated.html")
-def navigation_authenticated(categories, request, **kwargs):
-    """
-    Displaying the desktop navigation when user is authenticated
-
-    Usage:
-        {% navigation_authenticated categories=Category.objects.all request=request %}
-
-    Variables:
-        + categories: Category[] | The categories that should be displayed in the theme dropdown.
-        + request: Request | The django request object.
-        + questionnaire: QuestionnaireStep | The default QuestionnaireStep, if any.
-        - has_general_faq_questions: boolean | If the FAQ menu item should be shown.
-        - show_plans: boolean | If the Plan item should be shown.
-    """
 
     return {
         **kwargs,
diff --git a/src/open_inwoner/components/tests/test_header.py b/src/open_inwoner/components/tests/test_header.py
new file mode 100644
index 0000000000..1c1f2048a8
--- /dev/null
+++ b/src/open_inwoner/components/tests/test_header.py
@@ -0,0 +1,83 @@
+from django.test import TestCase
+
+from pyquery import PyQuery
+
+from open_inwoner.accounts.tests.factories import UserFactory
+from open_inwoner.cms.products.cms_apps import ProductsApphook
+from open_inwoner.cms.tests import cms_tools
+from open_inwoner.cms.tests.cms_tools import create_apphook_page
+from open_inwoner.configurations.models import SiteConfiguration
+from open_inwoner.pdc.tests.factories import CategoryFactory
+
+
+class HeaderTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = UserFactory()
+        cls.user.set_password("12345")
+        cls.user.email = "test@email.com"
+        cls.user.save()
+
+        cms_tools.create_homepage()
+
+        # PrimaryNavigation.html requires apphook + categories
+        create_apphook_page(ProductsApphook)
+        cls.published1 = CategoryFactory(
+            path="0001", name="First one", slug="first-one"
+        )
+        cls.published2 = CategoryFactory(
+            path="0002", name="Second one", slug="second-one"
+        )
+
+    def test_categories_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = True
+        config.save()
+
+        response = self.client.get("/")
+
+        doc = PyQuery(response.content)
+
+        categories = doc.find("[title='Onderwerpen']")
+        self.assertEqual(len(categories), 0)
+
+    def test_categories_not_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = False
+        config.save()
+
+        response = self.client.get("/")
+
+        doc = PyQuery(response.content)
+
+        categories = doc.find("[title='Onderwerpen']")
+        self.assertEqual(len(categories), 2)
+        self.assertEqual(categories[0].tag, "a")
+        self.assertEqual(categories[1].tag, "button")
+
+    def test_search_bar_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_search_from_anonymous_users = True
+        config.save()
+
+        response = self.client.get("/")
+
+        doc = PyQuery(response.content)
+
+        search_buttons = doc.find("[title='Zoeken']")
+
+        self.assertEqual(len(search_buttons), 0)
+
+    def test_search_bar_not_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_search_from_anonymous_users = False
+        config.save()
+
+        response = self.client.get("/")
+
+        doc = PyQuery(response.content)
+
+        search_buttons = doc.find("[title='Zoeken']")
+
+        for button in search_buttons:
+            self.assertEqual(button.tag, "button")
diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py
index de70b00ea7..4d1947b9cf 100644
--- a/src/open_inwoner/conf/base.py
+++ b/src/open_inwoner/conf/base.py
@@ -423,7 +423,7 @@
             "level": "INFO",
             "propagate": True,
         },
-        "requests": {
+        "log_outgoing_requests": {
             "handlers": ["log_outgoing_requests", "save_outgoing_requests"],
             "level": "DEBUG",
             "propagate": True,
@@ -436,6 +436,7 @@
 # LOG OUTGOING REQUESTS
 #
 LOG_OUTGOING_REQUESTS_DB_SAVE = config("LOG_OUTGOING_REQUESTS_DB_SAVE", default=True)
+LOG_OUTGOING_REQUESTS_RESET_DB_SAVE_AFTER = None  # reset config after $ minutes
 
 
 #
diff --git a/src/open_inwoner/conf/fixtures/django-admin-index.json b/src/open_inwoner/conf/fixtures/django-admin-index.json
index 4e8c869a44..a13b5443c4 100644
--- a/src/open_inwoner/conf/fixtures/django-admin-index.json
+++ b/src/open_inwoner/conf/fixtures/django-admin-index.json
@@ -344,6 +344,14 @@
                 "openzaak",
                 "zaaktypeinformatieobjecttypeconfig"
             ],
+            [
+                "soap",
+                "soapservice"
+            ],
+            [
+                "ssd",
+                "ssdconfig"
+            ],
             [
                 "zgw_consumers",
                 "certificate"
diff --git a/src/open_inwoner/configurations/admin.py b/src/open_inwoner/configurations/admin.py
index 90b7a10955..78d0ec9315 100644
--- a/src/open_inwoner/configurations/admin.py
+++ b/src/open_inwoner/configurations/admin.py
@@ -201,6 +201,15 @@ class SiteConfigurarionAdmin(OrderedInlineModelAdminMixin, SingletonModelAdmin):
                 ),
             },
         ),
+        (
+            _("Display options for anonymous users"),
+            {
+                "fields": (
+                    "hide_categories_from_anonymous_users",
+                    "hide_search_from_anonymous_users",
+                )
+            },
+        ),
     )
     inlines = [SiteConfigurationPageInline]
     form = SiteConfigurarionAdminForm
diff --git a/src/open_inwoner/configurations/migrations/0047_siteconfiguration_hide_categories_from_anonymous_users.py b/src/open_inwoner/configurations/migrations/0047_siteconfiguration_hide_categories_from_anonymous_users.py
new file mode 100644
index 0000000000..37382b1441
--- /dev/null
+++ b/src/open_inwoner/configurations/migrations/0047_siteconfiguration_hide_categories_from_anonymous_users.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.15 on 2023-08-15 12:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("configurations", "0046_siteconfiguration_cookie_consent"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="hide_categories_from_anonymous_users",
+            field=models.BooleanField(
+                default=False,
+                help_text="If checked, categories will be hidden from users who are not logged in.",
+                verbose_name="Hide categories from anonymous users",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/configurations/migrations/0047_auto_20230809_0833.py b/src/open_inwoner/configurations/migrations/0048_siteconfiguration_warning_banner.py
similarity index 92%
rename from src/open_inwoner/configurations/migrations/0047_auto_20230809_0833.py
rename to src/open_inwoner/configurations/migrations/0048_siteconfiguration_warning_banner.py
index a08cdf5325..051bdcbfc4 100644
--- a/src/open_inwoner/configurations/migrations/0047_auto_20230809_0833.py
+++ b/src/open_inwoner/configurations/migrations/0048_siteconfiguration_warning_banner.py
@@ -8,7 +8,10 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("configurations", "0046_siteconfiguration_cookie_consent"),
+        (
+            "configurations",
+            "0047_siteconfiguration_hide_categories_from_anonymous_users",
+        ),
     ]
 
     operations = [
diff --git a/src/open_inwoner/configurations/migrations/0049_siteconfiguration_hide_search_from_anonymous_users.py b/src/open_inwoner/configurations/migrations/0049_siteconfiguration_hide_search_from_anonymous_users.py
new file mode 100644
index 0000000000..0fe8e7ac04
--- /dev/null
+++ b/src/open_inwoner/configurations/migrations/0049_siteconfiguration_hide_search_from_anonymous_users.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.20 on 2023-08-16 10:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "configurations",
+            "0048_siteconfiguration_warning_banner",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteconfiguration",
+            name="hide_search_from_anonymous_users",
+            field=models.BooleanField(
+                default=False,
+                help_text="If checked, only authenticated users will be able to search the page.",
+                verbose_name="Hide search from anonymous users",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/configurations/models.py b/src/open_inwoner/configurations/models.py
index 0d36556e51..08faa31724 100644
--- a/src/open_inwoner/configurations/models.py
+++ b/src/open_inwoner/configurations/models.py
@@ -465,6 +465,20 @@ class SiteConfiguration(SingletonModel):
         default=True,
         help_text=_("Whether file sharing via the messages is allowed or not"),
     )
+    hide_categories_from_anonymous_users = models.BooleanField(
+        verbose_name=_("Hide categories from anonymous users"),
+        default=False,
+        help_text=_(
+            "If checked, categories will be hidden from users who are not logged in."
+        ),
+    )
+    hide_search_from_anonymous_users = models.BooleanField(
+        verbose_name=_("Hide search from anonymous users"),
+        default=False,
+        help_text=_(
+            "If checked, only authenticated users will be able to search the page."
+        ),
+    )
 
     class Meta:
         verbose_name = _("Site Configuration")
diff --git a/src/open_inwoner/pdc/tests/test_views.py b/src/open_inwoner/pdc/tests/test_views.py
new file mode 100644
index 0000000000..27d1565188
--- /dev/null
+++ b/src/open_inwoner/pdc/tests/test_views.py
@@ -0,0 +1,93 @@
+from django.test import TestCase, override_settings
+from django.urls import reverse
+
+from open_inwoner.accounts.tests.factories import UserFactory
+from open_inwoner.configurations.models import SiteConfiguration
+
+from .factories import CategoryFactory
+
+
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+class TestCategoryListView(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = UserFactory()
+        cls.user.set_password("12345")
+        cls.user.email = "test@email.com"
+        cls.user.save()
+
+    def test_access_restricted(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = True
+        config.save()
+
+        url = reverse("products:category_list")
+
+        # request with anonymous user
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/products/")
+
+        # request with user logged in
+        self.client.login(email=self.user.email, password="12345")
+
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_access_not_restricted(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = False
+        config.save()
+
+        url = reverse("products:category_list")
+
+        # request with anonymous user
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+
+
+@override_settings(ROOT_URLCONF="open_inwoner.cms.tests.urls")
+class TestCategoryDetailView(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = UserFactory()
+        cls.user.set_password("12345")
+        cls.user.email = "test@email.com"
+        cls.user.save()
+
+        cls.category = CategoryFactory.create(name="test cat")
+
+    def test_access_restricted(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = True
+        config.save()
+
+        url = reverse("products:category_detail", kwargs={"slug": self.category.slug})
+
+        # request with anonymous user
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/products/test-cat/")
+
+        # request with user logged in
+        self.client.login(email=self.user.email, password="12345")
+
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_access_not_restricted(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = False
+        config.save()
+
+        url = reverse("products:category_detail", kwargs={"slug": self.category.slug})
+
+        # request with anonymous user
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, 200)
diff --git a/src/open_inwoner/pdc/views.py b/src/open_inwoner/pdc/views.py
index c64897f80a..53f88c0581 100644
--- a/src/open_inwoner/pdc/views.py
+++ b/src/open_inwoner/pdc/views.py
@@ -9,8 +9,8 @@
 
 from open_inwoner.configurations.models import SiteConfiguration
 from open_inwoner.pdc.models.product import ProductCondition
-from open_inwoner.plans.models import Plan
 from open_inwoner.questionnaire.models import QuestionnaireStep
+from open_inwoner.utils.views import LoginMaybeRequiredMixin
 
 from ..utils.views import CommonPageMixin
 from .choices import YesNo
@@ -112,7 +112,9 @@ def get_context_data(self, **kwargs):
         return super().get_context_data(**kwargs)
 
 
-class CategoryListView(CommonPageMixin, ListBreadcrumbMixin, ListView):
+class CategoryListView(
+    LoginMaybeRequiredMixin, CommonPageMixin, ListBreadcrumbMixin, ListView
+):
     template_name = "pages/category/list.html"
     model = Category
 
@@ -124,9 +126,18 @@ def crumbs(self):
         config = SiteConfiguration.get_solo()
         return [(config.theme_title, reverse("products:category_list"))]
 
+    @property
+    def display_restricted(self):
+        config = SiteConfiguration.get_solo()
+        return config.hide_categories_from_anonymous_users is True
+
 
 class CategoryDetailView(
-    CommonPageMixin, BaseBreadcrumbMixin, CategoryBreadcrumbMixin, DetailView
+    LoginMaybeRequiredMixin,
+    CommonPageMixin,
+    BaseBreadcrumbMixin,
+    CategoryBreadcrumbMixin,
+    DetailView,
 ):
     template_name = "pages/category/detail.html"
     model = Category
@@ -166,6 +177,11 @@ def get_context_data(self, **kwargs):
     def get_breadcrumb_name(self):
         return self.object.name
 
+    @property
+    def display_restricted(self):
+        config = SiteConfiguration.get_solo()
+        return config.hide_categories_from_anonymous_users is True
+
 
 class ProductDetailView(
     CommonPageMixin, BaseBreadcrumbMixin, CategoryBreadcrumbMixin, DetailView
diff --git a/src/open_inwoner/scss/components/Card/Card.scss b/src/open_inwoner/scss/components/Card/Card.scss
index 4f6a740b56..7b3989ff61 100644
--- a/src/open_inwoner/scss/components/Card/Card.scss
+++ b/src/open_inwoner/scss/components/Card/Card.scss
@@ -66,6 +66,11 @@
     .form .caption__content {
       color: var(--color-tinted-mute);
     }
+
+    .card__body--direction-horizontal .link .link__text {
+      text-align: right;
+      padding-left: var(--spacing-small);
+    }
   }
 
   &__img {
diff --git a/src/open_inwoner/scss/components/Form/MultiCheckbox.scss b/src/open_inwoner/scss/components/Form/MultiCheckbox.scss
index 720cc8830e..1cc1589cb3 100644
--- a/src/open_inwoner/scss/components/Form/MultiCheckbox.scss
+++ b/src/open_inwoner/scss/components/Form/MultiCheckbox.scss
@@ -10,7 +10,8 @@
   margin: 0;
   gap: 18px;
 
-  label {
+  label,
+  .label {
     display: flex;
     flex-direction: row;
     gap: 10px;
diff --git a/src/open_inwoner/scss/pdf/_jaaropgave.scss b/src/open_inwoner/scss/pdf/_jaaropgave.scss
index 724cb66a22..9fe4779233 100644
--- a/src/open_inwoner/scss/pdf/_jaaropgave.scss
+++ b/src/open_inwoner/scss/pdf/_jaaropgave.scss
@@ -132,5 +132,14 @@
 
   .section__toelichting .subsection {
     line-height: 1.6;
+    font-size: 11px;
+
+    h1,
+    h2 {
+      font-size: 12px;
+    }
+    h1 {
+      text-transform: uppercase;
+    }
   }
 }
diff --git a/src/open_inwoner/scss/pdf/pdf_portrait.scss b/src/open_inwoner/scss/pdf/pdf_portrait.scss
index d00db302da..51eefcb8f8 100644
--- a/src/open_inwoner/scss/pdf/pdf_portrait.scss
+++ b/src/open_inwoner/scss/pdf/pdf_portrait.scss
@@ -1,4 +1,4 @@
-@import './overwrites';
+// @import './overwrites';
 @import './export';
 @import './portrait';
 @import './maandspecificatie';
diff --git a/src/open_inwoner/search/tests/test_views.py b/src/open_inwoner/search/tests/test_views.py
new file mode 100644
index 0000000000..9c4710766c
--- /dev/null
+++ b/src/open_inwoner/search/tests/test_views.py
@@ -0,0 +1,25 @@
+from django.test import TestCase
+from django.urls import reverse
+
+from open_inwoner.configurations.models import SiteConfiguration
+
+
+class TestSearchView(TestCase):
+    def test_search_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = True
+        config.save()
+
+        response = self.client.get(reverse("search:search"))
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, "/accounts/login/?next=/search/")
+
+    def test_search_not_hidden_from_anonymous_users(self):
+        config = SiteConfiguration.get_solo()
+        config.hide_categories_from_anonymous_users = False
+        config.save()
+
+        response = self.client.get(reverse("search:search"))
+
+        self.assertEqual(response.status_code, 200)
diff --git a/src/open_inwoner/search/views.py b/src/open_inwoner/search/views.py
index cae0f61678..df8e4e751d 100644
--- a/src/open_inwoner/search/views.py
+++ b/src/open_inwoner/search/views.py
@@ -6,14 +6,17 @@
 from django.utils.translation import gettext as _
 from django.views.generic import FormView
 
+from open_inwoner.configurations.models import SiteConfiguration
 from open_inwoner.utils.mixins import PaginationMixin
-from open_inwoner.utils.views import CommonPageMixin, LogMixin
+from open_inwoner.utils.views import CommonPageMixin, LoginMaybeRequiredMixin, LogMixin
 
 from .forms import FeedbackForm, SearchForm
 from .searches import search_products
 
 
-class SearchView(LogMixin, CommonPageMixin, PaginationMixin, FormView):
+class SearchView(
+    LoginMaybeRequiredMixin, LogMixin, CommonPageMixin, PaginationMixin, FormView
+):
     form_class = SearchForm
     template_name = "pages/search.html"
     paginate_by = 20
@@ -135,3 +138,8 @@ def form_valid(self, form):
             ),
         )
         return HttpResponseRedirect(http_referer)
+
+    @property
+    def display_restricted(self):
+        config = SiteConfiguration.get_solo()
+        return config.hide_categories_from_anonymous_users is True
diff --git a/src/open_inwoner/ssd/client.py b/src/open_inwoner/ssd/client.py
index 47b2c4fcfa..f7f443f6eb 100644
--- a/src/open_inwoner/ssd/client.py
+++ b/src/open_inwoner/ssd/client.py
@@ -2,10 +2,11 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
 from pathlib import Path
-from typing import Optional, get_type_hints
+from typing import Optional
 from uuid import uuid4
 
 from django.template import loader
+from django.template.defaultfilters import date as django_date
 from django.utils import timezone
 
 import requests
@@ -20,12 +21,6 @@
 BASE_DIR = Path(__file__).absolute().parent.parent
 
 
-# Endpoints for maand/jaarspecificatie
-# https://2secure-test.enschede.nl/ENSC/Intern/SSD/UitkeringsSpecificatieClient-v0600
-# https://2secure-test.enschede.nl/ENSC/Intern/SSD/JaarOpgaveClient-v0400
-# Test with 900038937
-
-
 class SSDBaseClient(ABC):
     """Base class for SSD SOAP client"""
 
@@ -150,11 +145,6 @@ def get_report(
 
         jaaropgave = response.text
 
-        # TODO: remove when done testing
-        # xml_response = "src/open_inwoner/ssd/tests/files/jaaropgave_response.xml"
-        # with open(xml_response, "r") as file:
-        #     jaaropgave = file.read()
-
         if (data := get_jaaropgave_dict(jaaropgave)) is None:
             return None
 
@@ -191,7 +181,7 @@ def format_report_date(self, report_date_iso: str) -> str:
 
     def format_file_name(self, report_date_iso: str) -> str:
         dt = datetime.strptime(report_date_iso, "%Y-%m-%d")
-        return f"Maandspecificatie {dt.strftime('%m %Y')}"
+        return f"Maandspecificatie {django_date(dt, 'M Y')}"
 
     def get_report(
         self, bsn: str, report_date_iso: str, request_base_url: str
@@ -205,11 +195,6 @@ def get_report(
 
         maandspecificatie = response.text
 
-        # TODO: remove when done testing
-        # xml_response = "src/open_inwoner/ssd/tests/files/uitkering_response.xml"
-        # with open(xml_response, "r") as file:
-        #     maandspecificatie = file.read()
-
         if (data := get_uitkering_dict(maandspecificatie)) is None:
             return None
 
diff --git a/src/open_inwoner/ssd/forms.py b/src/open_inwoner/ssd/forms.py
index 54f7696a88..f1326bce69 100644
--- a/src/open_inwoner/ssd/forms.py
+++ b/src/open_inwoner/ssd/forms.py
@@ -1,6 +1,7 @@
 from datetime import date, datetime
 
 from django import forms
+from django.template.defaultfilters import date as django_date
 
 from dateutil.relativedelta import relativedelta
 
@@ -31,7 +32,7 @@ def get_monthly_report_dates() -> list[tuple[date, str]]:
 
     choices = []
     for report_date in dates:
-        formatted = report_date.strftime("%B %Y")
+        formatted = django_date(report_date, "M Y")
         choices.append((report_date.date(), formatted))
 
     return choices
diff --git a/src/open_inwoner/ssd/migrations/0004_auto_20230808_1043.py b/src/open_inwoner/ssd/migrations/0004_auto_20230808_1043.py
new file mode 100644
index 0000000000..093f52352a
--- /dev/null
+++ b/src/open_inwoner/ssd/migrations/0004_auto_20230808_1043.py
@@ -0,0 +1,60 @@
+# Generated by Django 3.2.15 on 2023-08-08 08:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ssd", "0003_auto_20230802_1635"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="jaaropgave_display_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Jaaropgave' tab",
+                verbose_name="Display text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="jaaropgave_endpoint",
+            field=models.CharField(
+                default="JaarOpgaveClient-v0400",
+                help_text="Endpoint for the jaaropgave request",
+                max_length=256,
+                verbose_name="Jaaropgave endpoint",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="maandspecificatie_display_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Maandspecificatie' tab",
+                verbose_name="Display text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="maandspecificatie_endpoint",
+            field=models.CharField(
+                default="UitkeringsSpecificatieClient-v0600",
+                help_text="Endpoint for the maandspecificatie request",
+                max_length=256,
+                verbose_name="Maandspecificatie endpoint",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ssdconfig",
+            name="mijn_uitkeringen_text",
+            field=models.TextField(
+                blank=True,
+                help_text="The text displayed as overview of the 'Mijn Uikeringen' section.",
+                verbose_name="Overview text",
+            ),
+        ),
+    ]
diff --git a/src/open_inwoner/ssd/models.py b/src/open_inwoner/ssd/models.py
index 8f91bb46d0..661ee60e6a 100644
--- a/src/open_inwoner/ssd/models.py
+++ b/src/open_inwoner/ssd/models.py
@@ -24,14 +24,14 @@ class SSDConfig(SingletonModel):
     )
     maandspecificatie_endpoint = models.CharField(
         _("Maandspecificatie endpoint"),
-        max_length=32,
-        blank=True,
+        max_length=256,
+        default=("UitkeringsSpecificatieClient-v0600"),
         help_text=_("Endpoint for the maandspecificatie request"),
     )
     jaaropgave_endpoint = models.CharField(
         _("Jaaropgave endpoint"),
-        max_length=32,
-        blank=True,
+        max_length=256,
+        default=("JaarOpgaveClient-v0400"),
         help_text=_("Endpoint for the jaaropgave request"),
     )
     applicatie_naam = models.CharField(
@@ -57,7 +57,6 @@ class SSDConfig(SingletonModel):
     )
     mijn_uitkeringen_text = models.TextField(
         _("Overview text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Mijn Uikeringen' section."),
     )
@@ -80,7 +79,6 @@ class SSDConfig(SingletonModel):
     )
     jaaropgave_display_text = models.TextField(
         _("Display text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Jaaropgave' tab"),
     )
@@ -107,7 +105,6 @@ class SSDConfig(SingletonModel):
     )
     maandspecificatie_display_text = models.TextField(
         _("Display text"),
-        max_length=704,
         blank=True,
         help_text=_("The text displayed as overview of the 'Maandspecificatie' tab"),
     )
diff --git a/src/open_inwoner/ssd/templates/jaaropgave.html b/src/open_inwoner/ssd/templates/jaaropgave.html
index 6b5ff00a7d..8b576e47ee 100644
--- a/src/open_inwoner/ssd/templates/jaaropgave.html
+++ b/src/open_inwoner/ssd/templates/jaaropgave.html
@@ -53,15 +53,14 @@ <h2 class="h2">Participatiewet</h2>
                 <tr class="yearly-report__tr">
                     <th class="yearly-report__th">{{ jaaropgave.fiscaalloon.key }}</th>
                     <th class="yearly-report__th">{{ jaaropgave.loonheffing.key }}</th>
-                    <th class="yearly-report__th">{{ jaaropgave.arbeidskorting.key }}</th>
+                    <th class="yearly-report__th">Verrekende arbeidskorting</th>
                     <th class="yearly-report__th">{{ jaaropgave.loon_heffings_korting.key }}</th>
                     <th class="yearly-report__th">{{ jaaropgave.loon_heffings_korting.code_label }}</th>
                 </tr>
                 <tr class="yearly-report__tr">
                     <td class="yearly-report__td">{{ jaaropgave.fiscaalloon.sign }} {{ jaaropgave.fiscaalloon.value }}</td>
                     <td class="yearly-report__td">{{ jaaropgave.loonheffing.sign }} {{ jaaropgave.loonheffing.value }}</td>
-                    <!-- TODO: check if this needs to be changed; hard-coded for now. -->
-                    <td class="yearly-report__td">0</td>
+                    <th class="yearly-report__th">0</th>
                     <!-- Display first date -->
                     <td class="yearly-report__td">{{ jaaropgave.loon_heffings_korting.dates.0.ingangsdatum }}</td>
                     <td class="yearly-report__td">{{ jaaropgave.loon_heffings_korting.dates.0.code }}</td>
@@ -90,14 +89,13 @@ <h2 class="h2">Participatiewet</h2>
                 <tr class="yearly-report__tr">
                     <th class="yearly-report__th">{{ client.bsn_label }}</th>
                     <th class="yearly-report__th">{{ jaaropgave.loon_zorgverzekeringswet.key }}</th>
-                    <th class="yearly-report__th">{{ jaaropgave.ingehouden_bijdrage.key }}</th>
+                    <th class="yearly-report__th">Ingehouden bijdrage Zorgverzekeringswet</th>
                     <th class="yearly-report__th">{{ jaaropgave.periode.key }}</th>
                 </tr>
                 <tr class="yearly-report__tr">
                     <td class="yearly-report__td">{{ client.bsn }}</td>
-                    <!-- `loon_zvw` is calculated based on `fiscaalloon` - `vergoeding_premie` -->
                     <td class="yearly-report__td">{{ jaaropgave.loon_zorgverzekeringswet.value }}</td>
-                    <td class="yearly-report__td">{{ jaaropgave.ingehouden_bijdrage.sign }} {{ jaaropgave.ingehouden_bijdrage.value }}</td>
+                    <td class="yearly-report__td">0</td>
                     <td class="yearly-report__td">{{ jaaropgave.periode.van }} t/m {{ jaaropgave.periode.tot }}</td>
                 </tr>
             </table>
@@ -119,8 +117,6 @@ <h2 class="h2">Participatiewet</h2>
                     <th class="yearly-report__th">{{ jaaropgave.code_loonbelastingtabel.key }}</th>
                 </tr>
                 <tr class="yearly-report__tr">
-                    <!-- Hard-coded to 0 for now as different values don't make sense for the current purpose -->
-                    <!-- Cf. the Response2018.xslt template provided in the Taiga files -->
                     <td class="yearly-report__td">0</td>
                     <td class="yearly-report__td">0</td>
                     <td class="yearly-report__td">{{ jaaropgave.werkgevers_heffing_premie.value }}</td>
@@ -132,11 +128,8 @@ <h2 class="h2">Participatiewet</h2>
     <br/>
     <!-- TOELICHTING -->
     <section class="section section__toelichting extra-margin">
-        <div class="heading">
-            <h3 class="h3">Toelichting</h3>
-        </div>
         <div class="subsection extra-margin">
-            <p class="yearly-report__p">{{ jaaropgave_comments|markdown|safe }}</p>
+            <p class="yearly-report__p yearly-report__comments" >{{ jaaropgave_comments|markdown|safe }}</p>
         </div>
     </section>
 </div>
diff --git a/src/open_inwoner/ssd/tests/test_forms.py b/src/open_inwoner/ssd/tests/test_forms.py
index f2fe69c76d..ca6bec4832 100644
--- a/src/open_inwoner/ssd/tests/test_forms.py
+++ b/src/open_inwoner/ssd/tests/test_forms.py
@@ -29,7 +29,7 @@ def test_get_monthly_choices(self, mock_solo):
         self.assertEqual(date.month, 1)
 
         date_repr = choices[0][1]
-        self.assertEqual(date_repr, "January 1985")
+        self.assertEqual(date_repr, "Jan 1985")
 
     @freeze_time("1985-01-25")
     @patch("open_inwoner.ssd.forms.SSDConfig.get_solo")
@@ -50,7 +50,7 @@ def test_current_month_not_yet_available(self, m):
         self.assertEqual(date.month, 12)
 
         date_repr = choices[0][1]
-        self.assertEqual(date_repr, "December 1984")
+        self.assertEqual(date_repr, "Dec 1984")
 
     @patch("open_inwoner.ssd.forms.SSDConfig.get_solo")
     def test_monthly_reports_not_enabled(self, mock_solo):
diff --git a/src/open_inwoner/ssd/tests/test_views.py b/src/open_inwoner/ssd/tests/test_views.py
index d6aaced445..2b7e080b4c 100644
--- a/src/open_inwoner/ssd/tests/test_views.py
+++ b/src/open_inwoner/ssd/tests/test_views.py
@@ -119,9 +119,9 @@ def setUp(self):
         self.user.save()
 
     def test_get(self):
-        url = reverse("ssd:yearly_benefits_index")
 
         # request with anonymous user
+        url = reverse("ssd:yearly_benefits_index")
         response = self.client.get(url)
 
         self.assertEqual(response.status_code, HTTPStatus.FOUND)
diff --git a/src/open_inwoner/ssd/tests/test_xml_parsing.py b/src/open_inwoner/ssd/tests/test_xml_parsing.py
index 20a61a81fe..e7714abbb1 100644
--- a/src/open_inwoner/ssd/tests/test_xml_parsing.py
+++ b/src/open_inwoner/ssd/tests/test_xml_parsing.py
@@ -51,7 +51,7 @@ def test_uitkering_response_parsing(self):
             data["uitkeringsspecificatie"]["dossiernummer"]["value"], "61913"
         )
         self.assertEqual(data["uitkeringsspecificatie"]["periode"]["key"], "Periode")
-        self.assertEqual(data["uitkeringsspecificatie"]["periode"]["value"], "May 1985")
+        self.assertEqual(data["uitkeringsspecificatie"]["periode"]["value"], "Mei 1985")
         self.assertEqual(data["uitkeringsspecificatie"]["regeling"]["key"], "Regeling")
         self.assertEqual(
             data["uitkeringsspecificatie"]["regeling"]["value"], "Participatiewet"
@@ -166,10 +166,6 @@ def test_jaaropgave_response_parsing(self):
         self.assertEqual(data["inhoudingsplichtige"]["woonplaatsnaam"], "Enschede")
 
         # jaaropgave
-        self.assertEqual(
-            data["jaaropgave"]["arbeidskorting"]["key"], "Verrekende arbeidskorting"
-        )
-        self.assertEqual(data["jaaropgave"]["arbeidskorting"]["value"], "MYSTERY")
         self.assertEqual(
             data["jaaropgave"]["code_loonbelastingtabel"]["key"],
             "Code loonbelastingtabel",
@@ -181,11 +177,6 @@ def test_jaaropgave_response_parsing(self):
             "Loon loonbelasting / volksverzekeringen",
         )
         self.assertEqual(data["jaaropgave"]["fiscaalloon"]["value"], "7305")
-        self.assertEqual(
-            data["jaaropgave"]["ingehouden_bijdrage"]["key"],
-            "Ingehouden bijdrage Zorgverzekeringswet",
-        )
-        self.assertEqual(data["jaaropgave"]["ingehouden_bijdrage"]["value"], "0")
         self.assertEqual(
             data["jaaropgave"]["loon_heffings_korting"]["key"],
             "Loonheffingskorting Met ingang van",
diff --git a/src/open_inwoner/ssd/xml.py b/src/open_inwoner/ssd/xml.py
index b055f0849d..ea7e0bfe22 100644
--- a/src/open_inwoner/ssd/xml.py
+++ b/src/open_inwoner/ssd/xml.py
@@ -1,10 +1,9 @@
-import calendar
 from datetime import datetime
 from typing import Optional
 from xml.parsers.expat import ExpatError
 
+from django.template.defaultfilters import date as django_date
 from django.utils.text import slugify
-from django.utils.translation import gettext_lazy as _
 
 import xmltodict
 from glom import glom
@@ -31,15 +30,12 @@ def format_date(date_str) -> str:
 
 
 def format_date_month_name(date_str) -> str:
-    """Transform '204805' into 'May 2048'"""
+    """Transform '204805' into 'Mei 2048'"""
 
     patched = date_str + "01"
-    date = datetime.strptime(patched, "%Y%m%d")
-    month_name = calendar.month_name[date.month]
+    dt = datetime.strptime(patched, "%Y%m%d")
 
-    formatted_date = _("{month_name} {year}").format(
-        month_name=month_name, year=date.year
-    )
+    formatted_date = django_date(dt, "M Y")
 
     return formatted_date
 
@@ -322,24 +318,14 @@ def get_jaaropgave_dict(xml_data) -> Optional[dict]:
             ),
             "value": glom(specificatiejaaropgave_spec, "Loonheffing.WaardeBedrag"),
         },
-        # TODO: figure out if this is needed; see below
         "arbeidskorting": {
             "key": "Verrekende arbeidskorting",
-            "value": "MYSTERY",
+            "value": "0",
         },
         "code_loonbelastingtabel": {
             "key": "Code loonbelastingtabel",
             "value": glom(specificatiejaaropgave_spec, "CdPremieVolksverzekering"),
         },
-        "ingehouden_bijdrage": {
-            "key": "Ingehouden bijdrage Zorgverzekeringswet",
-            "sign": get_sign(
-                specificatiejaaropgave_spec, "IngehoudenPremieZVW.CdPositiefNegatief"
-            ),
-            "value": glom(
-                specificatiejaaropgave_spec, "IngehoudenPremieZVW.WaardeBedrag"
-            ),
-        },
         "vergoeding_premie_zvw": {
             "sign": get_sign(
                 specificatiejaaropgave_spec, "VergoedingPremieZVW.CdPositiefNegatief"
@@ -366,28 +352,6 @@ def get_jaaropgave_dict(xml_data) -> Optional[dict]:
                 "WerkgeversheffingPremieZVW.WaardeBedrag",
             ),
         },
-        # TODO: figure out where this is used; relation to `arbeitskorting`?
-        # "belaste_alimentatie": {
-        #     "sign": get_sign(
-        #         specificatiejaaropgave_spec, "BelasteAlimentatie.CdPositiefNegatief"
-        #     ),
-        #     "bedrag": (
-        #         float(
-        #             glom(
-        #                 specificatiejaaropgave_spec,
-        #                 "BelasteAlimentatie.WaardeBedrag",
-        #                 default=0,
-        #             )
-        #         )
-        #         / 100
-        #         if glom(
-        #             specificatiejaaropgave_spec,
-        #             "BelasteAlimentatie.WaardeBedrag",
-        #             default=0,
-        #         )
-        #         else 0
-        #     ),
-        # },
     }
 
     #
diff --git a/src/open_inwoner/templates/pages/plans/create.html b/src/open_inwoner/templates/pages/plans/create.html
index c1a8a877af..ab316e6e37 100644
--- a/src/open_inwoner/templates/pages/plans/create.html
+++ b/src/open_inwoner/templates/pages/plans/create.html
@@ -24,16 +24,16 @@ <h1 class="h1">{% trans "Start nieuwe samenwerking" %}</h1>
                         <div>{% trans "Doel" %}</div>
                         <div></div>
                     </div>
-                    <label class="plan-template__row radio">
+                    <div class="label plan-template__row radio">
                         <div>
                             <input class="radio__input" type="radio" name="template" value="" id="id_template_0" {% if not form.data.template %}checked{% endif %}>
                             <label class="radio__label" for="id_template_0">Geen template</label>
                         </div>
                         <div></div>
                         <div></div>
-                    </label>
+                    </div>
                     {% for tpl_id, plan_template in form.template.field.choices %}
-                        <label class="plan-template__row radio">
+                        <div class="label plan-template__row radio">
                             <div>
                                 <input class="radio__input" type="radio" name="template" value="{{ plan_template.id }}" id="id_template_{{ plan_template.id }}"
                                        {% if tpl_id == form.data.template %}checked{% endif %}>
@@ -60,7 +60,7 @@ <h2 class="h2 modal__title" id="modal__title">{{ plan_template.name }}
                                     </div>
                                 </div>
                             </div>
-                        </label>
+                        </div>
                     {% endfor %}
                 </div>
 
diff --git a/src/open_inwoner/templates/utils/widgets/message_file_input.html b/src/open_inwoner/templates/utils/widgets/message_file_input.html
index e2f37c7559..0eec17b12c 100644
--- a/src/open_inwoner/templates/utils/widgets/message_file_input.html
+++ b/src/open_inwoner/templates/utils/widgets/message_file_input.html
@@ -1,5 +1,5 @@
 <input type="{{ widget.type }}" name="{{ widget.name }}" data-init="{{ widget.value|default:'' }}"{% include "django/forms/widgets/attrs.html" %}>
-<label>
+<span>
     <input type="text" name="{{ widget.init_name }}" id="{{ widget.init_id }}" {% if widget.value %} value="{{ widget.value.instance.uuid }}"{% endif %} class="message-file__init">
-</label>
+</span>
 
diff --git a/src/open_inwoner/templates/utils/widgets/private_file_input.html b/src/open_inwoner/templates/utils/widgets/private_file_input.html
index 48d1b6111d..539154b584 100644
--- a/src/open_inwoner/templates/utils/widgets/private_file_input.html
+++ b/src/open_inwoner/templates/utils/widgets/private_file_input.html
@@ -1,5 +1,5 @@
 {% if widget.is_initial %}{{ widget.initial_text }}: <a href="{{ url }}">{{ widget.value }}</a>{% if not widget.required %}
 <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
-<label for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</label>{% endif %}<br>
+<span for="{{ widget.checkbox_id }}">{{ widget.clear_checkbox_label }}</span>{% endif %}<br>
 {{ widget.input_text }}:{% endif %}
 <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
diff --git a/src/open_inwoner/utils/context_processors.py b/src/open_inwoner/utils/context_processors.py
index a90a511b25..2c744efa80 100644
--- a/src/open_inwoner/utils/context_processors.py
+++ b/src/open_inwoner/utils/context_processors.py
@@ -90,6 +90,7 @@ def settings(request):
         "warning_banner_text": config.warning_banner_text,
         "warning_banner_background_color": config.warning_banner_background_color,
         "warning_banner_font_color": config.warning_banner_font_color,
+        "hide_categories_from_anonymous_users": config.hide_categories_from_anonymous_users,
     }
 
     if hasattr(django_settings, "SENTRY_CONFIG"):
diff --git a/src/open_inwoner/utils/views.py b/src/open_inwoner/utils/views.py
index ab78d18b1c..4cebb559bb 100644
--- a/src/open_inwoner/utils/views.py
+++ b/src/open_inwoner/utils/views.py
@@ -1,4 +1,5 @@
 from django import http
+from django.contrib.auth.mixins import AccessMixin
 from django.template import TemplateDoesNotExist, loader
 from django.views.decorators.csrf import requires_csrf_token
 from django.views.defaults import ERROR_500_TEMPLATE_NAME
@@ -49,6 +50,21 @@ def crumbs(self):
         ]
 
 
+class LoginMaybeRequiredMixin(AccessMixin):
+    """
+    Conditional access control on a per-view basis
+
+    Access to the view is restricted to authenticated users if
+    `self.display_restricted` is `True`, which must be defined on
+    the view inheriting from this Mixin.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated and self.display_restricted:
+            return self.handle_no_permission()
+        return super().dispatch(request, *args, **kwargs)
+
+
 @requires_csrf_token
 def server_error(request, template_name=ERROR_500_TEMPLATE_NAME):
     """