diff --git a/ephios/core/forms/events.py b/ephios/core/forms/events.py
index 2234141eb..6b88eb84e 100644
--- a/ephios/core/forms/events.py
+++ b/ephios/core/forms/events.py
@@ -18,9 +18,9 @@
 from guardian.shortcuts import assign_perm, get_objects_for_user, get_users_with_perms, remove_perm
 from recurrence.forms import RecurrenceField
 
-from ephios.core import signup
 from ephios.core.dynamic_preferences_registry import event_type_preference_registry
 from ephios.core.models import Event, EventType, LocalParticipation, Shift, UserProfile
+from ephios.core.signup.methods import enabled_signup_methods
 from ephios.core.widgets import MultiUserProfileWidget
 from ephios.extra.crispy import AbortLink
 from ephios.extra.permissions import get_groups_with_perms
@@ -171,7 +171,7 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        signup_methods = list(signup.enabled_signup_methods())
+        signup_methods = list(enabled_signup_methods())
         if self.instance and (method_slug := self.instance.signup_method_slug):
             if method_slug not in map(operator.attrgetter("slug"), signup_methods):
                 signup_methods.append(self.instance.signup_method)
@@ -221,7 +221,7 @@ class EventDuplicationForm(forms.Form):
 class EventTypeForm(forms.ModelForm):
     class Meta:
         model = EventType
-        fields = ["title", "can_grant_qualification", "color"]
+        fields = ["title", "color"]
         widgets = {"color": ColorInput()}
 
     def clean_color(self):
diff --git a/ephios/core/ical.py b/ephios/core/ical.py
index 7f1e3362e..fe8ece146 100644
--- a/ephios/core/ical.py
+++ b/ephios/core/ical.py
@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.db.models import Prefetch
 from django.shortcuts import get_object_or_404
 from django_ical.views import ICalFeed
 from guardian.shortcuts import get_users_with_perms
@@ -48,9 +49,20 @@ def __init__(self, user):
         super().__init__()
         self.user = user
 
+    def item_start_datetime(self, item):
+        return item.participations.all()[0].start_time
+
+    def item_end_datetime(self, item):
+        return item.participations.all()[0].end_time
+
     def items(self):
-        return self.user.get_shifts(
-            with_participation_state_in=[AbstractParticipation.States.CONFIRMED]
+        shift_ids = self.user.participations.filter(
+            state=AbstractParticipation.States.CONFIRMED
+        ).values_list("shift", flat=True)
+        return (
+            Shift.objects.filter(pk__in=shift_ids)
+            .select_related("event")
+            .prefetch_related(Prefetch("participations", queryset=self.user.participations.all()))
         )
 
 
diff --git a/ephios/core/migrations/0014_auto_20211106_1852.py b/ephios/core/migrations/0014_auto_20211106_1852.py
new file mode 100644
index 000000000..67dbf619e
--- /dev/null
+++ b/ephios/core/migrations/0014_auto_20211106_1852.py
@@ -0,0 +1,84 @@
+# Generated by Django 3.2.9 on 2021-11-06 17:52
+
+import django.db.models.deletion
+import django.db.models.manager
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0013_auto_20211027_2203"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="event",
+            options={
+                "base_manager_name": "all_objects",
+                "default_manager_name": "objects",
+                "permissions": [("view_past_event", "Can view past events")],
+                "verbose_name": "event",
+                "verbose_name_plural": "events",
+            },
+        ),
+        migrations.AlterModelManagers(
+            name="event",
+            managers=[
+                ("objects", django.db.models.manager.Manager()),
+                ("all_objects", django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name="eventtype",
+            name="can_grant_qualification",
+        ),
+        migrations.AddField(
+            model_name="abstractparticipation",
+            name="comment",
+            field=models.CharField(blank=True, max_length=255, verbose_name="Comment"),
+        ),
+        migrations.AddField(
+            model_name="abstractparticipation",
+            name="individual_end_time",
+            field=models.DateTimeField(null=True, verbose_name="individual end time"),
+        ),
+        migrations.AddField(
+            model_name="abstractparticipation",
+            name="individual_start_time",
+            field=models.DateTimeField(null=True, verbose_name="individual start time"),
+        ),
+        migrations.AddField(
+            model_name="notification",
+            name="created_at",
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="abstractparticipation",
+            name="state",
+            field=models.IntegerField(
+                choices=[
+                    (0, "requested"),
+                    (1, "confirmed"),
+                    (2, "declined by user"),
+                    (3, "rejected by responsible"),
+                    (4, "getting dispatched"),
+                ],
+                default=4,
+                verbose_name="state",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="localparticipation",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="participations",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Participant",
+            ),
+        ),
+    ]
diff --git a/ephios/core/models/events.py b/ephios/core/models/events.py
index 9fc3df9c6..38c90bd40 100644
--- a/ephios/core/models/events.py
+++ b/ephios/core/models/events.py
@@ -3,8 +3,6 @@
 from datetime import timedelta
 from typing import TYPE_CHECKING
 
-import pytz
-from django.conf import settings
 from django.db import models, transaction
 from django.db.models import (
     BooleanField,
@@ -18,11 +16,14 @@
     SlugField,
     TextField,
 )
+from django.db.models.functions import Coalesce
 from django.utils import formats
 from django.utils.text import slugify
+from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
 from dynamic_preferences.models import PerInstancePreferenceModel
 from guardian.shortcuts import assign_perm
+from polymorphic.managers import PolymorphicManager
 from polymorphic.models import PolymorphicModel
 
 from ephios.extra.json import CustomJSONDecoder, CustomJSONEncoder
@@ -31,7 +32,8 @@
 
 if TYPE_CHECKING:
     from ephios.core.models import UserProfile
-    from ephios.core.signup import AbstractParticipant, SignupStats
+    from ephios.core.signup.methods import BaseSignupMethod, SignupStats
+    from ephios.core.signup.participants import AbstractParticipant
 
 
 class ActiveManager(Manager):
@@ -41,7 +43,6 @@ def get_queryset(self):
 
 class EventType(Model):
     title = CharField(_("title"), max_length=254)
-    can_grant_qualification = BooleanField(_("can grant qualification"))
     color = CharField(_("color"), max_length=7, default="#343a40")
 
     class Meta:
@@ -102,7 +103,7 @@ def is_multi_day(self):
 
     def get_signup_stats(self) -> "SignupStats":
         """Return a SignupStats object aggregated over all shifts of this event, or a default"""
-        from ephios.core.signup import SignupStats
+        from ephios.core.signup.methods import SignupStats
 
         default_for_no_shifts = SignupStats.ZERO
 
@@ -138,7 +139,42 @@ def activate(self):
 register_model_for_logging(Event, ModelFieldsLogConfig())
 
 
-class AbstractParticipation(PolymorphicModel):
+class ParticipationManager(PolymorphicManager):
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .annotate(
+                start_time=Coalesce("individual_start_time", "shift__start_time"),
+                end_time=Coalesce("individual_end_time", "shift__end_time"),
+            )
+        )
+
+
+class DatetimeDisplayMixin:
+    """
+    Date and time formatting utilities used for start_time and end_time attributes
+    in AbstractParticipation and Shift.
+    """
+
+    def get_start_time(self):
+        return self.start_time
+
+    def get_end_time(self):
+        return self.end_time
+
+    def get_date_display(self):
+        start_time = localtime(self.get_start_time())
+        return f"{formats.date_format(start_time, 'l')}, {formats.date_format(start_time, 'SHORT_DATE_FORMAT')}"
+
+    def get_time_display(self):
+        return f"{formats.time_format(localtime(self.get_start_time()))} - {formats.time_format(localtime(self.get_end_time()))}"
+
+    def get_datetime_display(self):
+        return f"{self.get_date_display()}, {self.get_time_display()}"
+
+
+class AbstractParticipation(DatetimeDisplayMixin, PolymorphicModel):
     class States(models.IntegerChoices):
         REQUESTED = 0, _("requested")
         CONFIRMED = 1, _("confirmed")
@@ -153,15 +189,34 @@ def labels_dict(cls):
     shift = ForeignKey(
         "Shift", on_delete=models.CASCADE, verbose_name=_("shift"), related_name="participations"
     )
-    state = IntegerField(_("state"), choices=States.choices)
+    state = IntegerField(_("state"), choices=States.choices, default=States.GETTING_DISPATCHED)
     data = models.JSONField(default=dict, verbose_name=_("Signup data"))
 
+    """
+    Overwrites shift time. Use `start_time` and `end_time` to get the applicable time (implemented with a custom manager).
+    """
+    individual_start_time = DateTimeField(_("individual start time"), null=True)
+    individual_end_time = DateTimeField(_("individual end time"), null=True)
+
+    # human readable comment
+    comment = models.CharField(_("Comment"), max_length=255, blank=True)
+
     """
     The finished flag is used to make sure the participation_finished signal is only sent out once, even
     if the shift time is changed afterwards.
     """
     finished = models.BooleanField(default=False, verbose_name=_("finished"))
 
+    objects = ParticipationManager()
+
+    def has_customized_signup(self):
+        return bool(
+            self.individual_start_time
+            or self.individual_end_time
+            or self.comment
+            or self.shift.signup_method.has_customized_signup(self)
+        )
+
     @property
     def hours_value(self):
         td = self.shift.end_time - self.shift.start_time
@@ -180,6 +235,9 @@ def __str__(self):
         except NotImplementedError:
             return super().__str__()
 
+    def is_in_positive_state(self):
+        return self.state in {self.States.CONFIRMED, self.States.REQUESTED}
+
 
 PARTICIPATION_LOG_CONFIG = ModelFieldsLogConfig(
     unlogged_fields=["id", "data", "abstractparticipation_ptr"],
@@ -187,7 +245,7 @@ def __str__(self):
 )
 
 
-class Shift(Model):
+class Shift(DatetimeDisplayMixin, Model):
     event = ForeignKey(
         Event, on_delete=models.CASCADE, related_name="shifts", verbose_name=_("event")
     )
@@ -206,22 +264,18 @@ class Meta:
         db_table = "shift"
 
     @property
-    def signup_method(self):
-        from ephios.core.signup import signup_method_from_slug
+    def signup_method(self) -> "BaseSignupMethod":
+        from ephios.core.signup.methods import signup_method_from_slug
 
         try:
-            return signup_method_from_slug(self.signup_method_slug, self)
+            event = self.event
+        except Event.DoesNotExist:
+            event = None
+        try:
+            return signup_method_from_slug(self.signup_method_slug, self, event=event)
         except ValueError:
             return None
 
-    def get_start_end_time_display(self):
-        tz = pytz.timezone(settings.TIME_ZONE)
-        start_time = self.start_time.astimezone(tz)
-        return (
-            f"{formats.date_format(start_time, 'l')}, {formats.date_format(start_time, 'SHORT_DATE_FORMAT')}, "
-            + f"{formats.time_format(start_time)} - {formats.time_format(self.end_time.astimezone(tz))}"
-        )
-
     def get_participants(self, with_state_in=frozenset({AbstractParticipation.States.CONFIRMED})):
         for participation in self.participations.filter(state__in=with_state_in):
             yield participation.participant
@@ -230,7 +284,7 @@ def get_absolute_url(self):
         return f"{self.event.get_absolute_url()}#shift-{self.pk}"
 
     def __str__(self):
-        return f"{self.event.title} ({self.get_start_end_time_display()})"
+        return f"{self.event.title} ({self.get_datetime_display()})"
 
 
 class ShiftLogConfig(ModelFieldsLogConfig):
@@ -243,13 +297,17 @@ def object_to_attach_logentries_to(self, instance):
     def initial_log_recorders(self, instance):
         # pylint: disable=undefined-variable
         yield from super().initial_log_recorders(instance)
-        yield DerivedFieldsLogRecorder(
-            lambda shift: {
-                _("Signup method"): str(method.verbose_name)
-                if (method := shift.signup_method)
-                else None
-            }
-        )
+
+        def get_signup_method_name_mapping(shift):
+            from ephios.core.signup.methods import installed_signup_methods
+
+            v = None
+            for method in installed_signup_methods():
+                if method.slug == shift.signup_method_slug:
+                    v = str(method.verbose_name)
+            return {_("Signup method"): v}
+
+        yield DerivedFieldsLogRecorder(get_signup_method_name_mapping)
 
 
 register_model_for_logging(Shift, ShiftLogConfig())
@@ -257,7 +315,10 @@ def initial_log_recorders(self, instance):
 
 class LocalParticipation(AbstractParticipation):
     user: "UserProfile" = ForeignKey(
-        "UserProfile", on_delete=models.CASCADE, verbose_name=_("Participant")
+        "UserProfile",
+        on_delete=models.CASCADE,
+        verbose_name=_("Participant"),
+        related_name="participations",
     )
 
     def save(self, *args, **kwargs):
@@ -289,7 +350,7 @@ class PlaceholderParticipation(AbstractParticipation):
     @property
     def participant(self) -> "AbstractParticipant":
         from ephios.core.models.users import Qualification
-        from ephios.core.signup.methods import PlaceholderParticipant
+        from ephios.core.signup.participants import PlaceholderParticipant
 
         return PlaceholderParticipant(
             first_name=self.first_name,
diff --git a/ephios/core/models/users.py b/ephios/core/models/users.py
index 7ff11c3d4..575b74ec0 100644
--- a/ephios/core/models/users.py
+++ b/ephios/core/models/users.py
@@ -131,7 +131,7 @@ def is_minor(self):
         return self.age < 18
 
     def as_participant(self):
-        from ephios.core.signup import LocalUserParticipant
+        from ephios.core.signup.participants import LocalUserParticipant
 
         return LocalUserParticipant(
             first_name=self.first_name,
@@ -150,25 +150,17 @@ def qualifications(self):
             expires=Max(F("grants__expires"), filter=Q(grants__user=self)),
         )
 
-    def get_shifts(self, with_participation_state_in):
-        from ephios.core.models import Shift
-
-        shift_ids = self.localparticipation_set.filter(
-            state__in=with_participation_state_in
-        ).values_list("shift", flat=True)
-        return Shift.objects.filter(pk__in=shift_ids).select_related("event")
-
     def get_workhour_items(self):
         from ephios.core.models import AbstractParticipation
 
         participations = (
-            self.localparticipation_set.filter(state=AbstractParticipation.States.CONFIRMED)
+            self.participations.filter(state=AbstractParticipation.States.CONFIRMED)
             .annotate(
                 duration=ExpressionWrapper(
-                    (F("shift__end_time") - F("shift__start_time")),
+                    (F("end_time") - F("start_time")),
                     output_field=models.DurationField(),
                 ),
-                date=ExpressionWrapper(TruncDate(F("shift__start_time")), output_field=DateField()),
+                date=ExpressionWrapper(TruncDate(F("start_time")), output_field=DateField()),
                 reason=F("shift__event__title"),
             )
             .values("duration", "date", "reason")
@@ -457,6 +449,7 @@ class Notification(Model):
     data = models.JSONField(
         blank=True, default=dict, encoder=CustomJSONEncoder, decoder=CustomJSONDecoder
     )
+    created_at = models.DateTimeField(auto_now_add=True)
 
     @functools.cached_property
     def notification_type(self):
diff --git a/ephios/core/pdf.py b/ephios/core/pdf.py
index 5b5fefc91..7afb2b699 100644
--- a/ephios/core/pdf.py
+++ b/ephios/core/pdf.py
@@ -136,7 +136,7 @@ def get_story(self):
 
         for shift in self.event.shifts.all():
             story.append(Spacer(height=1 * cm, width=19 * cm))
-            story.append(Paragraph(shift.get_start_end_time_display(), self.style["Heading2"]))
+            story.append(Paragraph(shift.get_datetime_display(), self.style["Heading2"]))
             data = [
                 [_("Meeting time"), formats.time_format(shift.meeting_time.astimezone(tz))],
             ] + [
diff --git a/ephios/core/services/notifications/types.py b/ephios/core/services/notifications/types.py
index 37894e7d3..eee6dd53b 100644
--- a/ephios/core/services/notifications/types.py
+++ b/ephios/core/services/notifications/types.py
@@ -1,3 +1,4 @@
+from typing import List
 from urllib.parse import urljoin
 
 from django.conf import settings
@@ -13,7 +14,7 @@
 from ephios.core.models import AbstractParticipation, Event, LocalParticipation, UserProfile
 from ephios.core.models.users import Consequence, Notification
 from ephios.core.signals import register_notification_types
-from ephios.core.signup import LocalUserParticipant
+from ephios.core.signup.participants import LocalUserParticipant
 
 
 def installed_notification_types():
@@ -169,9 +170,13 @@ def get_url(cls, notification):
         return urljoin(settings.GET_SITE_URL(), event.get_absolute_url())
 
 
-class ParticipationConfirmedNotification(AbstractNotificationHandler):
-    slug = "ephios_participation_confirmed"
-    title = _("Your participation has been confirmed")
+class ParticipationMixin:
+    @classmethod
+    def get_url(cls, notification):
+        shift = AbstractParticipation.objects.get(
+            id=notification.data.get("participation_id")
+        ).shift
+        return urljoin(settings.GET_SITE_URL(), shift.get_absolute_url())
 
     @classmethod
     def send(cls, participation: AbstractParticipation):
@@ -186,6 +191,11 @@ def send(cls, participation: AbstractParticipation):
             data=dict(participation_id=participation.id, email=participation.participant.email),
         )
 
+
+class ParticipationConfirmedNotification(ParticipationMixin, AbstractNotificationHandler):
+    slug = "ephios_participation_confirmed"
+    title = _("Your participation has been confirmed")
+
     @classmethod
     def get_subject(cls, notification):
         event = AbstractParticipation.objects.get(
@@ -195,25 +205,46 @@ def get_subject(cls, notification):
 
     @classmethod
     def as_plaintext(cls, notification):
-        shift = AbstractParticipation.objects.get(
+        participation: AbstractParticipation = AbstractParticipation.objects.get(
             id=notification.data.get("participation_id")
-        ).shift
-        return _("Your participation for {shift} is now confirmed.").format(shift=shift)
+        )
+        message = _("Your participation for {shift} is now confirmed.").format(
+            shift=participation.shift
+        )
+        if participation.has_customized_signup():
+            message += f'\n\n{_("Your time is")} {participation.get_time_display()}'
+        return message
+
+
+class ParticipationRejectedNotification(ParticipationMixin, AbstractNotificationHandler):
+    slug = "ephios_participation_rejected"
+    title = _("Your participation has been rejected")
 
     @classmethod
-    def get_url(cls, notification):
+    def get_subject(cls, notification):
         event = AbstractParticipation.objects.get(
             id=notification.data.get("participation_id")
         ).shift.event
-        return urljoin(settings.GET_SITE_URL(), event.get_absolute_url())
+        return _("Participation rejected for {event}").format(event=event)
 
+    @classmethod
+    def as_plaintext(cls, notification):
+        shift = AbstractParticipation.objects.get(
+            id=notification.data.get("participation_id")
+        ).shift
+        return _("Your participation for {shift} has been rejected by a responsible user.").format(
+            shift=shift
+        )
 
-class ParticipationRejectedNotification(AbstractNotificationHandler):
-    slug = "ephios_participation_rejected"
-    title = _("Your participation has been rejected")
+
+class ParticipationCustomizationNotification(ParticipationMixin, AbstractNotificationHandler):
+    slug = "ephios_participation_customized"
+    title = _("A confirmed participation of yours has been tweaked by a responsible")
 
     @classmethod
-    def send(cls, participation: AbstractParticipation):
+    def send(
+        cls, participation: AbstractParticipation, claims: List[str]
+    ):  # pylint: disable=arguments-differ
         user = (
             participation.user
             if participation.get_real_instance_class() == LocalParticipation
@@ -222,63 +253,70 @@ def send(cls, participation: AbstractParticipation):
         Notification.objects.create(
             slug=cls.slug,
             user=user,
-            data=dict(participation_id=participation.id, email=participation.participant.email),
+            data=dict(
+                participation_id=participation.id,
+                email=participation.participant.email,
+                claims=claims,
+            ),
         )
 
     @classmethod
     def get_subject(cls, notification):
-        event = AbstractParticipation.objects.get(
+        shift = AbstractParticipation.objects.get(
             id=notification.data.get("participation_id")
-        ).shift.event
-        return _("Participation rejected for {event}").format(event=event)
+        ).shift
+        return _("Participation tweaked for {shift}").format(shift=shift)
 
     @classmethod
     def as_plaintext(cls, notification):
         shift = AbstractParticipation.objects.get(
             id=notification.data.get("participation_id")
         ).shift
-        return _("Your participation for {shift} has been rejected by a responsible user.").format(
-            shift=shift
-        )
-
-    @classmethod
-    def get_url(cls, notification):
-        event = AbstractParticipation.objects.get(
-            id=notification.data.get("participation_id")
-        ).shift.event
-        return urljoin(settings.GET_SITE_URL(), event.get_absolute_url())
+        message = _(
+            "Your participation for {shift} has been tweaked by a responsible user."
+        ).format(shift=shift)
+        message += "\n\n" + "\n".join(f"- {claim}" for claim in notification.data.get("claims", []))
+        return message
 
 
-class ResponsibleParticipationRequested(AbstractNotificationHandler):
-    slug = "ephios_participation_responsible_requested"
-    title = _("A participation has been requested for your event")
+class ResponsibleMixin:
+    def __init__(self, participation: AbstractParticipation):
+        self.participation = participation
 
-    @classmethod
-    def send(cls, participation: AbstractParticipation):
-        responsible_users = get_users_with_perms(
-            participation.shift.event, only_with_perms_in=["change_event"]
+    def responsible_users(self):
+        users = get_users_with_perms(
+            self.participation.shift.event, only_with_perms_in=["change_event"]
         ).distinct()
-        disposition_url = urljoin(
-            settings.GET_SITE_URL(),
-            reverse("core:shift_disposition", kwargs=dict(pk=participation.shift.pk)),
-        )
-        notifications = []
-        for user in responsible_users:
+        for user in users:
             if (
-                not participation.get_real_instance_class() == LocalParticipation
-                or user != participation.user
+                self.participation.get_real_instance_class() != LocalParticipation
+                or user != self.participation.user
             ):
-                notifications.append(
-                    Notification(
-                        slug=cls.slug,
-                        user=user,
-                        data=dict(
-                            participation_id=participation.id,
-                            disposition_url=disposition_url,
-                        ),
-                    )
+                yield user
+
+    def get_data(self, **kwargs):
+        kwargs["disposition_url"] = urljoin(
+            settings.GET_SITE_URL(),
+            reverse("core:shift_disposition", kwargs=dict(pk=self.participation.shift.pk)),
+        )
+        kwargs["participation_id"] = self.participation.id
+        return kwargs
+
+    def send(self):
+        Notification.objects.bulk_create(
+            [
+                Notification(
+                    slug=self.slug,
+                    user=user,
+                    data=self.get_data(),
                 )
-        Notification.objects.bulk_create(notifications)
+                for user in self.responsible_users()
+            ]
+        )
+
+    @classmethod
+    def get_url(cls, notification):
+        return notification.data.get("disposition_url")
 
     @classmethod
     def get_subject(cls, notification):
@@ -290,6 +328,11 @@ def get_subject(cls, notification):
             state=participation_state, event=participation.shift.event
         )
 
+
+class ResponsibleParticipationRequestedNotification(ResponsibleMixin, AbstractNotificationHandler):
+    slug = "ephios_participation_responsible_requested"
+    title = _("A participation has been requested for your event")
+
     @classmethod
     def as_plaintext(cls, notification):
         participation = AbstractParticipation.objects.get(
@@ -307,9 +350,53 @@ def as_plaintext(cls, notification):
             participant=participation.participant, shift=participation.shift
         )
 
+
+class ResponsibleConfirmedParticipationDeclinedNotification(
+    ResponsibleMixin, AbstractNotificationHandler
+):
+    slug = "ephios_participation_responsible_confirmed_declined"
+    title = _("A participant declined after having been confirmed for your event")
+
     @classmethod
-    def get_url(cls, notification):
-        return notification.data.get("disposition_url")
+    def as_plaintext(cls, notification):
+        participation = AbstractParticipation.objects.get(
+            id=notification.data.get("participation_id")
+        )
+        return _("{participant} declined their participation in {shift}.").format(
+            participant=participation.participant, shift=participation.shift
+        )
+
+
+class ResponsibleConfirmedParticipationCustomizedNotification(
+    ResponsibleMixin, AbstractNotificationHandler
+):
+    slug = "ephios_participation_responsible_confirmed_customized"
+    title = _("A confirmed participant altered their participation")
+
+    @classmethod
+    def get_subject(cls, notification):
+        participation = AbstractParticipation.objects.get(
+            id=notification.data.get("participation_id")
+        )
+        return _("Participation altered for {event}").format(event=participation.shift.event)
+
+    def __init__(self, participation: AbstractParticipation, claims: List[str]):
+        super().__init__(participation)
+        self.claims = claims
+
+    def get_data(self, **kwargs):
+        return super().get_data(claims=self.claims)
+
+    @classmethod
+    def as_plaintext(cls, notification):
+        participation = AbstractParticipation.objects.get(
+            id=notification.data.get("participation_id")
+        )
+        message = _("{participant} altered their participation in {shift}.").format(
+            participant=participation.participant, shift=participation.shift
+        )
+        message += "\n\n" + "\n".join(f"- {claim}" for claim in notification.data.get("claims", []))
+        return message
 
 
 class EventReminderNotification(AbstractNotificationHandler):
@@ -437,7 +524,10 @@ def as_plaintext(cls, notification):
     NewProfileNotification,
     ParticipationRejectedNotification,
     ParticipationConfirmedNotification,
-    ResponsibleParticipationRequested,
+    ParticipationCustomizationNotification,
+    ResponsibleParticipationRequestedNotification,
+    ResponsibleConfirmedParticipationDeclinedNotification,
+    ResponsibleConfirmedParticipationCustomizedNotification,
     NewEventNotification,
     EventReminderNotification,
     CustomEventParticipantNotification,
diff --git a/ephios/core/signals.py b/ephios/core/signals.py
index aca1419ae..17b487d7b 100644
--- a/ephios/core/signals.py
+++ b/ephios/core/signals.py
@@ -16,6 +16,13 @@
 subclasses of ``ephios.core.signup.methods.BaseSignupMethod``.
 """
 
+check_participant_signup = PluginSignal()
+"""
+This signal is sent out so receivers can prevent signup for a shift or provide feedback for dispatchers.
+Receivers will receive a ``participant`` and ``method`` keyword argument and
+should return an instance of the fitting! subclass of ``ephios.core.signup.methods.ParticipationError`` or None.
+"""
+
 footer_link = PluginSignal()
 """
 This signal is sent out to get links for that page footer. Receivers should return a dict of
diff --git a/ephios/core/signup/__init__.py b/ephios/core/signup/__init__.py
index 4437b77c9..e69de29bb 100644
--- a/ephios/core/signup/__init__.py
+++ b/ephios/core/signup/__init__.py
@@ -1 +0,0 @@
-from .methods import *  # no-qa
diff --git a/ephios/core/signup/disposition.py b/ephios/core/signup/disposition.py
index 634e26470..9a9919cd7 100644
--- a/ephios/core/signup/disposition.py
+++ b/ephios/core/signup/disposition.py
@@ -8,24 +8,36 @@
 from django.views.generic.detail import SingleObjectMixin
 from django_select2.forms import ModelSelect2Widget
 
-from ephios.core.models import AbstractParticipation, Qualification, Shift, UserProfile
+from ephios.core.models import (
+    AbstractParticipation,
+    LocalParticipation,
+    Qualification,
+    Shift,
+    UserProfile,
+)
+from ephios.core.services.notifications.types import (
+    ParticipationConfirmedNotification,
+    ParticipationCustomizationNotification,
+    ParticipationRejectedNotification,
+)
+from ephios.core.signup.methods import BaseParticipationForm
 from ephios.extra.mixins import CustomPermissionRequiredMixin
 
 
-class BaseDispositionParticipationForm(forms.ModelForm):
+class BaseDispositionParticipationForm(BaseParticipationForm):
     disposition_participation_template = "core/disposition/fragment_participation.html"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.can_delete = self.instance.state == AbstractParticipation.States.GETTING_DISPATCHED
+        self.fields["comment"].disabled = True
         try:
             self.shift = self.instance.shift
         except AttributeError as e:
             raise ValueError(f"{type(self)} must be initialized with an instance.") from e
 
-    class Meta:
-        model = AbstractParticipation
-        fields = ["state"]
+    class Meta(BaseParticipationForm.Meta):
+        fields = ["state", "individual_start_time", "individual_end_time", "comment"]
         widgets = dict(state=forms.HiddenInput(attrs={"class": "state-input"}))
 
 
@@ -148,7 +160,7 @@ def get_template_names(self):
 
     def post(self, request, *args, **kwargs):
         shift = self.object
-        from ephios.core.signup import PlaceholderParticipant
+        from ephios.core.signup.participants import PlaceholderParticipant
 
         participant = PlaceholderParticipant(
             first_name=request.POST["first_name"],
@@ -187,36 +199,38 @@ def get_formset(self):
         )
         return formset
 
-    def post(self, request, *args, **kwargs):
-        formset = self.get_formset()
-        if formset.is_valid():
-            formset.save()
-
-            for participation, changed_fields in formset.changed_objects:
-                from ephios.core.models import LocalParticipation
-
-                if "state" in changed_fields and (
-                    not participation.get_real_instance_class() == LocalParticipation
-                    or participation.user != request.user
-                ):
+    def _send_participant_notifications(self, formset):
+        for participation, changed_fields in formset.changed_objects:
+            if (
+                participation.get_real_instance_class() != LocalParticipation
+                or participation.user != self.request.user
+            ):
+                if "state" in changed_fields:
+                    # send state updates
                     if participation.state == AbstractParticipation.States.CONFIRMED:
-                        from ephios.core.services.notifications.types import (
-                            ParticipationConfirmedNotification,
-                        )
-
                         ParticipationConfirmedNotification.send(participation)
                     elif participation.state == AbstractParticipation.States.RESPONSIBLE_REJECTED:
-                        from ephios.core.services.notifications.types import (
-                            ParticipationRejectedNotification,
-                        )
-
                         ParticipationRejectedNotification.send(participation)
+                elif participation.state == AbstractParticipation.States.CONFIRMED:
+                    form: BaseParticipationForm = next(
+                        filter(lambda f, p=participation: f.instance == p, formset.forms)
+                    )
+                    if claims := form.get_customization_notification_info():
+                        # If state didn't change, but confirmed participation was customized, notify about that.
+                        ParticipationCustomizationNotification.send(participation, claims)
+
+    def post(self, request, *args, **kwargs):
+        formset = self.get_formset()
+        if not formset.is_valid():
+            return self.get(request, *args, **kwargs, formset=formset)
+
+        formset.save()
+        self._send_participant_notifications(formset)
 
-            self.object.participations.filter(
-                state=AbstractParticipation.States.GETTING_DISPATCHED
-            ).non_polymorphic().delete()
-            return redirect(self.object.event.get_absolute_url())
-        return self.get(request, *args, **kwargs, formset=formset)
+        self.object.participations.filter(
+            state=AbstractParticipation.States.GETTING_DISPATCHED
+        ).non_polymorphic().delete()
+        return redirect(self.object.event.get_absolute_url())
 
     def get_context_data(self, **kwargs):
         kwargs.setdefault("formset", self.get_formset())
diff --git a/ephios/core/signup/methods.py b/ephios/core/signup/methods.py
index c4278627b..1c0af645c 100644
--- a/ephios/core/signup/methods.py
+++ b/ephios/core/signup/methods.py
@@ -3,32 +3,41 @@
 import logging
 from argparse import Namespace
 from collections import OrderedDict
-from datetime import date
 from typing import List, Optional
 
+from crispy_forms.bootstrap import FormActions
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import HTML, Field, Layout
 from django import forms
 from django.contrib import messages
-from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.db import transaction
-from django.db.models import Q, QuerySet
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.template import Context, Template
-from django.template.defaultfilters import yesno
+from django.template.loader import get_template
 from django.urls import reverse
-from django.utils import formats, timezone
+from django.utils import timezone
+from django.utils.formats import date_format
 from django.utils.functional import SimpleLazyObject, cached_property, classproperty
-from django.utils.safestring import mark_safe
+from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
-from django.views import View
-
-from ephios.core.models import AbstractParticipation, LocalParticipation, Qualification, Shift
+from django.views.generic import FormView
+
+from ephios.core.models import AbstractParticipation, Shift
+from ephios.core.services.notifications.types import (
+    ResponsibleConfirmedParticipationCustomizedNotification,
+    ResponsibleConfirmedParticipationDeclinedNotification,
+)
+from ephios.core.signals import (
+    check_participant_signup,
+    participant_from_request,
+    register_signup_methods,
+)
+from ephios.core.signup.participants import AbstractParticipant
+from ephios.extra.utils import format_anything
 from ephios.extra.widgets import CustomSplitDateTimeWidget
 
-from ..models.events import PlaceholderParticipation
-from ..signals import participant_from_request, register_signup_methods
-from .disposition import BaseDispositionParticipationForm
-
 logger = logging.getLogger(__name__)
 
 
@@ -49,194 +58,286 @@ def signup_method_from_slug(slug, shift=None, event=None):
     raise ValueError(_("Signup Method '{slug}' was not found.").format(slug=slug))
 
 
-@dataclasses.dataclass(frozen=True)
-class AbstractParticipant:
-    first_name: str
-    last_name: str
-    qualifications: QuerySet = dataclasses.field(hash=False)
-    date_of_birth: Optional[date]
-    email: Optional[str]  # if set to None, no notifications are sent
-
-    def get_age(self, today: date = None):
-        if self.date_of_birth is None:
-            return None
-        today, born = today or date.today(), self.date_of_birth
-        return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
-
-    def __str__(self):
-        return f"{self.first_name} {self.last_name}"
+class ParticipationError(ValidationError):
+    """Superclass of errors used in the signup mechanism."""
 
-    def new_participation(self, shift):
-        raise NotImplementedError
 
-    def participation_for(self, shift):
-        """Return the participation object for a shift. Return None if it does not exist."""
-        raise NotImplementedError
+class ActionDisallowedError(ValidationError):
+    """Error to return if the participant cannot perform an action on a shift."""
 
-    def all_participations(self):
-        """Return all participations for this participant"""
-        raise NotImplementedError
 
-    @functools.lru_cache
-    def collect_all_qualifications(self) -> set:
-        return Qualification.collect_all_included_qualifications(self.qualifications)
+class SignupDisallowedError(ActionDisallowedError):
+    """
+    Error to return if the participant cannot sign up for a shift,
+    even if formally fit, because of certain other circumstances.
+    """
 
-    def has_qualifications(self, qualifications):
-        return set(qualifications) <= self.collect_all_qualifications()
 
-    def reverse_signup_action(self, shift):
-        raise NotImplementedError
+class DeclineDisallowedError(ActionDisallowedError):
+    """Error to return if the participant cannot decline a shift."""
 
-    def reverse_event_detail(self, event):
-        raise NotImplementedError
 
-    @property
-    def icon(self):
-        return mark_safe('<span class="fa fa-user"></span>')
+class ParticipantUnfitError(ParticipationError):
+    """
+    Error to return if the participant is unfit for a shift,
+    regardless of participation state or situation.
+    """
 
 
-@dataclasses.dataclass(frozen=True)
-class LocalUserParticipant(AbstractParticipant):
-    user: get_user_model()
+def prevent_getting_participant_from_request_user(request):
+    """
+    To prevent plugin authors from accessing the participant using request.user, the SignupView
+    uses this method to block access to `as_participant` of the request.user attribute value.
+    """
+    original_user = request.user
 
-    def new_participation(self, shift):
-        return LocalParticipation(shift=shift, user=self.user)
+    class ProtectedUser(SimpleLazyObject):
+        def as_participant(self):
+            raise Exception("Access of request.user.as_participant in SignupViews is not allowed.")
 
-    def participation_for(self, shift):
-        try:
-            return LocalParticipation.objects.get(shift=shift, user=self.user)
-        except LocalParticipation.DoesNotExist:
-            return None
+    request.user = ProtectedUser(lambda: original_user)
 
-    def all_participations(self):
-        return LocalParticipation.objects.filter(user=self.user)
 
-    def reverse_signup_action(self, shift):
-        return reverse("core:signup_action", kwargs=dict(pk=shift.pk))
+def get_nonlocal_participant_from_request(request):
+    for _, participant in participant_from_request.send(sender=None, request=request):
+        if participant is not None:
+            return participant
+    raise PermissionDenied
 
-    def reverse_event_detail(self, event):
-        return event.get_absolute_url()
 
+class BaseParticipationForm(forms.ModelForm):
+    individual_start_time = forms.SplitDateTimeField(
+        label=_("Individual start time"), widget=CustomSplitDateTimeWidget, required=False
+    )
+    individual_end_time = forms.SplitDateTimeField(
+        label=_("Individual end time"),
+        widget=CustomSplitDateTimeWidget,
+        required=False,
+    )
 
-@dataclasses.dataclass(frozen=True)
-class PlaceholderParticipant(AbstractParticipant):
-    def new_participation(self, shift):
-        return PlaceholderParticipation(
-            shift=shift, first_name=self.first_name, last_name=self.last_name
-        )
+    def clean_individual_start_time(self):
+        if self.cleaned_data["individual_start_time"] == self.shift.start_time:
+            return None
+        return self.cleaned_data["individual_start_time"]
 
-    def participation_for(self, shift):
-        try:
-            return PlaceholderParticipation.objects.get(
-                shift=shift, first_name=self.first_name, last_name=self.last_name
-            )
-        except PlaceholderParticipation.DoesNotExist:
+    def clean_individual_end_time(self):
+        if self.cleaned_data["individual_end_time"] == self.shift.end_time:
             return None
+        return self.cleaned_data["individual_end_time"]
+
+    def clean(self):
+        cleaned_data = super().clean()
+        start = cleaned_data["individual_start_time"] or self.shift.start_time
+        end = cleaned_data["individual_end_time"] or self.shift.end_time
+        if end < start:
+            self.add_error("individual_end_time", _("End time must not be before start time."))
+        return cleaned_data
+
+    class Meta:
+        model = AbstractParticipation
+        fields = ["individual_start_time", "individual_end_time", "comment"]
+
+    def __init__(self, *args, **kwargs):
+        instance = kwargs["instance"]
+        self.shift = getattr(self, "shift", instance.shift)
+        kwargs["initial"] = {
+            **kwargs.get("initial", {}),
+            "individual_start_time": instance.individual_start_time or self.shift.start_time,
+            "individual_end_time": instance.individual_end_time or self.shift.end_time,
+        }
+        super().__init__(*args, **kwargs)
+
+    def get_customization_notification_info(self):
+        """
+        Return a list of human readable messages for changed participation attributes responsibles should be informed about.
+        This should not include the participation state, but customization aspects such as individual times, detailed disposition information, etc.
+        """
+        assert self.is_valid()
+        info = []
+        for time in ["start_time", "end_time"]:
+            if (field_name := f"individual_{time}") in self.changed_data:
+                info.append(
+                    _("{label} was changed from {initial} to {current}.").format(
+                        label=self.fields[field_name].label,
+                        initial=date_format(
+                            localtime(self.initial[field_name].astimezone()),
+                            format="SHORT_DATETIME_FORMAT",
+                        ),
+                        current=date_format(
+                            localtime(self.cleaned_data[field_name] or getattr(self.shift, time)),
+                            format="TIME_FORMAT",
+                        ),
+                    )
+                )
 
-    def all_participations(self):
-        return AbstractParticipation.objects.none()
+        return info
 
-    def reverse_signup_action(self, shift):
-        raise NotImplementedError
 
-    def reverse_event_detail(self, event):
-        raise NotImplementedError
+class BaseSignupForm(BaseParticipationForm):
+    def _get_field_layout(self):
+        return Layout(*(Field(name) for name in self.fields))
 
-    @property
-    def icon(self):
-        return mark_safe(
-            f'<span class="fa fa-user-tag" data-toggle="tooltip" data-placement="left" title="{_("Placeholder")}"></span>'
+    def _get_buttons(self):
+        if (
+            p := self.participant.participation_for(self.method.shift)
+        ) is not None and p.is_in_positive_state():
+            buttons = [
+                HTML(
+                    f'<button class="btn btn-success mt-1 ms-1 float-end" type="submit" name="signup_choice" value="customize">{_("Save")}</button>'
+                )
+            ]
+        else:
+            buttons = [
+                HTML(
+                    f'<button class="btn btn-success mt-1 ms-1 float-end" type="submit" name="signup_choice" value="sign_up">{self.method.registration_button_text}</button>'
+                )
+            ]
+        buttons.append(
+            HTML(
+                f'<a class="btn btn-secondary mt-1" href="{self.participant.reverse_event_detail(self.method.shift.event)}">{_("Cancel")}</a>'
+            )
+        )
+        if self.method.can_decline(self.participant):
+            buttons.append(
+                HTML(
+                    f'<button class="btn btn-secondary mt-1 ms-1 float-end" type="submit" name="signup_choice" value="decline">{_("Decline")}</button>'
+                )
+            )
+        return buttons
+
+    def __init__(self, *args, **kwargs):
+        self.method = kwargs.pop("method")
+        self.targets_positive_state = kwargs.pop("targets_positive_state")
+        self.shift: Shift = self.method.shift
+        self.participant: AbstractParticipant = kwargs.pop("participant")
+        super().__init__(*args, **kwargs)
+        self.helper = FormHelper()
+        self.helper.layout = Layout(
+            self._get_field_layout(),
+            FormActions(*self._get_buttons()),
         )
 
-
-class ParticipationError(ValidationError):
-    pass
-
-
-def prevent_getting_participant_from_request_user(request):
-    original_user = request.user
-
-    class ProtectedUser(SimpleLazyObject):
-        def as_participant(self):
-            raise Exception("Access of request.user.as_participant in SignupViews is not allowed.")
-
-    request.user = ProtectedUser(lambda: original_user)
-
-
-def get_nonlocal_participant_from_session(request):
-    for _, participant in participant_from_request.send(sender=None, request=request):
-        if participant is not None:
-            return participant
-    raise PermissionDenied
+        if not self.shift.signup_method.configuration.user_can_customize_signup_times:
+            self.fields["individual_start_time"].disabled = True
+            self.fields["individual_end_time"].disabled = True
+
+    def clean(self):
+        cleaned_data = super().clean()
+        self._validate_conflicting_participations(self, self.targets_positive_state)
+        return cleaned_data
+
+    def _validate_conflicting_participations(self, form, targets_positive_state):
+        if not targets_positive_state:
+            return
+        if conflicts := get_conflicting_participations(
+            participant=form.instance.participant,
+            start_time=form.cleaned_data["individual_start_time"] or self.shift.start_time,
+            end_time=form.cleaned_data["individual_end_time"] or self.shift.end_time,
+            shift=self.shift,
+            total=False,
+        ):
+            form.add_error("individual_start_time", "")
+            form.add_error(
+                "individual_end_time",
+                _("You are already confirmed for other shifts at this time: {shifts}.").format(
+                    shifts=", ".join(str(shift) for shift in conflicts)
+                ),
+            )
 
 
-class BaseSignupView(View):
+class BaseSignupView(FormView):
     """
     This View reacts to the signup or decline buttons being pressed using a POST request.
-    It can be modified to not directly create a participation, but show a form first, then
-    create the participation.
-
     Beware that request.user might be anonymous. You should only act on participants acquired
     using `get_participant`.
     """
 
     shift: Shift = ...
     method: "BaseSignupMethod" = ...
+    form_class = BaseSignupForm
+    template_name = "core/signup.html"
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs.update(
+            {
+                "method": self.method,
+                "participant": self.participant,
+                "instance": self.participation,
+                "targets_positive_state": self.request.POST.get("signup_choice") == "sign_up",
+            }
+        )
+        return kwargs
+
+    @cached_property
+    def participation(self):
+        return self.method.get_participation_for(self.participant)
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.participant: AbstractParticipant = kwargs["participant"]
         prevent_getting_participant_from_request_user(request)
 
-    def dispatch(self, request, *args, **kwargs):
-        if (choice := request.POST.get("signup_choice")) is not None:
-            if choice == "sign_up":
-                return self.signup_pressed()
+    def form_valid(self, form):
+        if (choice := self.request.POST.get("signup_choice")) is not None:
+            if choice == "sign_up" and self.method.can_sign_up(self.participant):
+                return self.signup_pressed(form)
+            if choice == "customize" and self.method.can_customize_signup(self.participant):
+                return self.customize_pressed(form)
             if choice == "decline":
-                return self.decline_pressed()
-            raise ValueError(_("'{choice}' is not a valid signup action.").format(choice=choice))
-        return super().dispatch(request, *args, **kwargs)
+                return self.decline_pressed(form)
+            messages.error(self.request, _("This action is not allowed."))
+            return redirect(self.participant.reverse_event_detail(self.shift.event))
+        form.add_error(None, _("Form submission is missing the mode of signup."))
+        return self.form_invalid(form)
+
+    def customize_pressed(self, form):
+        form.save()
+        if claims := form.get_customization_notification_info():
+            ResponsibleConfirmedParticipationCustomizedNotification(form.instance, claims).send()
+        messages.success(self.request, _("Your participation was saved."))
+        return redirect(self.participant.reverse_event_detail(self.shift.event))
 
-    def signup_pressed(self, **signup_kwargs):
+    def signup_pressed(self, form):
         try:
             with transaction.atomic():
-                self.method.perform_signup(self.participant, **signup_kwargs)
-                messages.success(
-                    self.request,
-                    self.method.signup_success_message.format(shift=self.shift),
-                )
+                participation = form.save()
+                self.method.perform_signup(self.participant, participation, **form.cleaned_data)
         except ParticipationError as errors:
             for error in errors:
                 messages.error(self.request, self.method.signup_error_message.format(error=error))
+        else:
+            messages.success(
+                self.request,
+                self.method.signup_success_message.format(shift=self.shift),
+            )
         return redirect(self.participant.reverse_event_detail(self.shift.event))
 
-    def decline_pressed(self, **decline_kwargs):
+    def decline_pressed(self, form):
         try:
             with transaction.atomic():
-                self.method.perform_decline(self.participant, **decline_kwargs)
-                messages.info(
-                    self.request, self.method.decline_success_message.format(shift=self.shift)
-                )
+                participation = form.save()
+                self.method.perform_decline(self.participant, participation, **form.cleaned_data)
         except ParticipationError as errors:
             for error in errors:
                 messages.error(self.request, self.method.decline_error_message.format(error=error))
+        else:
+            messages.info(
+                self.request, self.method.decline_success_message.format(shift=self.shift)
+            )
         return redirect(self.participant.reverse_event_detail(self.shift.event))
 
 
 def check_event_is_active(method, participant):
     if not method.shift.event.active:
-        return ParticipationError(_("The event is not active."))
+        return ActionDisallowedError(_("The event is not active."))
 
 
 def check_participation_state_for_signup(method, participant):
     participation = participant.participation_for(method.shift)
     if participation is not None:
-        if participation.state == AbstractParticipation.States.REQUESTED:
-            return ParticipationError(_("You have already requested a participation."))
-        if participation.state == AbstractParticipation.States.CONFIRMED:
-            return ParticipationError(_("You are already signed up."))
         if participation.state == AbstractParticipation.States.RESPONSIBLE_REJECTED:
-            return ParticipationError(_("You have been rejected."))
+            return SignupDisallowedError(_("You have been rejected."))
 
 
 def check_participation_state_for_decline(method, participant):
@@ -246,11 +347,11 @@ def check_participation_state_for_decline(method, participant):
             participation.state == AbstractParticipation.States.CONFIRMED
             and not method.configuration.user_can_decline_confirmed
         ):
-            return ParticipationError(_("You cannot decline by yourself."))
+            return DeclineDisallowedError(_("You cannot decline by yourself."))
         if participation.state == AbstractParticipation.States.RESPONSIBLE_REJECTED:
-            return ParticipationError(_("You have been rejected."))
+            return DeclineDisallowedError(_("You have been rejected."))
         if participation.state == AbstractParticipation.States.USER_DECLINED:
-            return ParticipationError(_("You have already declined participating."))
+            return DeclineDisallowedError(_("You have already declined participating."))
 
 
 def check_inside_signup_timeframe(method, participant):
@@ -258,7 +359,7 @@ def check_inside_signup_timeframe(method, participant):
     if method.configuration.signup_until is not None:
         last_time = min(last_time, method.configuration.signup_until)
     if timezone.now() > last_time:
-        return ParticipationError(_("The signup period is over."))
+        return ActionDisallowedError(_("The signup period is over."))
 
 
 def check_participant_age(method, participant):
@@ -266,22 +367,89 @@ def check_participant_age(method, participant):
     day = method.shift.start_time.date()
     age = participant.get_age(day)
     if minimum_age is not None and age is not None and age < minimum_age:
-        return ParticipationError(
+        return ParticipantUnfitError(
             _("You are too young. The minimum age is {age}.").format(age=minimum_age)
         )
 
 
-def get_conflicting_participations(shift, participant):
-    return participant.all_participations().filter(
+def check_participant_signup_signal(method, participant):
+    errors = []
+    for _, result in check_participant_signup.send(None, method=method, participant=participant):
+        if result is not None:
+            errors.append(result)
+    return errors
+
+
+def get_conflicting_participations(
+    participant: AbstractParticipant, shift: Shift, start_time=None, end_time=None, total=False
+):
+    """
+    Return a queryset of participations of a participant in conflict with
+    a (potential) participation specified by the arguments.
+
+        Parameters:
+            participant: AbstractParticipant to check conflict for
+            shift: conflicting participations for this shift
+            start_time, end_time: specify times other than the default times of `shift`
+            total (bool): If True, only return conflicts that can't be
+                          resolved by only participating in only part of `shift`.
+
+        Returns:
+            a queryset of participations
+    """
+    start_time = start_time or shift.start_time
+    end_time = end_time or shift.end_time
+    qs = participant.all_participations().filter(
         ~Q(shift=shift)
         & Q(state=AbstractParticipation.States.CONFIRMED)
-        & Q(shift__start_time__lt=shift.end_time, shift__end_time__gt=shift.start_time)
+        & Q(start_time__lt=end_time, end_time__gt=start_time)
     )
+    if total:
+        qs = qs.filter(start_time__lte=shift.start_time, end_time__gte=shift.end_time)
+    return qs
+
+
+def check_conflicting_participations(method, participant):
+    start_time, end_time = method.shift.start_time, method.shift.end_time
+    if participation := participant.participation_for(method.shift):
+        start_time, end_time = participation.start_time, participation.end_time
+
+    # if users can provide individual times, only total conflicts should block signup
+    total = getattr(method.configuration, "user_can_customize_signup_times", False)
+    if conflicts := get_conflicting_participations(
+        participant=participant,
+        shift=method.shift,
+        start_time=start_time,
+        end_time=end_time,
+        total=total,
+    ):
+        return SignupDisallowedError(
+            _("You are already confirmed for other shifts at this time: {shifts}.").format(
+                shifts=", ".join(str(shift) for shift in conflicts)
+            )
+        )
 
 
-def check_conflicting_shifts(method, participant):
-    if get_conflicting_participations(method.shift, participant).exists():
-        return ParticipationError(_("You are already confirmed for another shift at this time."))
+class BaseSignupMethodConfigurationForm(forms.Form):
+    minimum_age = forms.IntegerField(
+        required=False, min_value=1, max_value=999, initial=None, label=_("Minimum age")
+    )
+    signup_until = forms.SplitDateTimeField(
+        required=False,
+        widget=CustomSplitDateTimeWidget,
+        initial=None,
+        label=_("Signup until"),
+    )
+    user_can_decline_confirmed = forms.BooleanField(
+        label=_("Confirmed users can decline by themselves"),
+        required=False,
+        help_text=_("only if the signup timeframe has not ended"),
+    )
+    user_can_customize_signup_times = forms.BooleanField(
+        label=_("Users can provide individual start and end times"),
+        required=False,
+        initial=True,
+    )
 
 
 class BaseSignupMethod:
@@ -301,16 +469,20 @@ def disposition_participation_form_class(self):
         This form will be used for participations in disposition.
         Set to None if you don't want to support the default disposition.
         """
+        from .disposition import BaseDispositionParticipationForm
+
         return BaseDispositionParticipationForm
 
-    @property
-    def configuration_form_class(self):
-        return forms.Form
+    configuration_form_class = BaseSignupMethodConfigurationForm
 
     @property
     def signup_view_class(self):
         return BaseSignupView
 
+    @property
+    def shift_state_template_name(self):
+        raise NotImplementedError
+
     description = """"""
 
     # use _ == gettext_lazy!
@@ -326,7 +498,10 @@ def __init__(self, shift, event=None):
         self.shift = shift
         self.event = getattr(shift, "event", event)
         self.configuration = Namespace(
-            **{name: config["default"] for name, config in self.get_configuration_fields().items()}
+            **{
+                name: field.initial
+                for name, field in self.configuration_form_class.base_fields.items()
+            }
         )
         if shift is not None:
             for key, value in shift.signup_configuration.items():
@@ -338,72 +513,127 @@ def signup_view(self):
 
     @property
     def _signup_checkers(self):
+        """Return a list of methods that check if the participant can sign up for the shift."""
         return [
             check_event_is_active,
             check_participation_state_for_signup,
             check_inside_signup_timeframe,
+            check_conflicting_participations,
             check_participant_age,
-            check_conflicting_shifts,
+            check_participant_signup_signal,
         ]
 
     @property
     def _decline_checkers(self):
+        """Return a list of methods that check if the participant can decline the shift."""
         return [
             check_event_is_active,
             check_participation_state_for_decline,
             check_inside_signup_timeframe,
         ]
 
+    def _run_checkers(self, participant, checkers) -> List[ParticipationError]:
+        errors = []
+        for checker in checkers:
+            # checkers can return None, a single ParticipationError, or a list of them
+            if (error := checker(self, participant)) is not None:
+                if isinstance(error, list):
+                    errors.extend(error)
+                else:
+                    errors.append(error)
+        return errors
+
     @functools.lru_cache()
     def get_signup_errors(self, participant) -> List[ParticipationError]:
-        return [
-            error
-            for checker in self._signup_checkers
-            if (error := checker(self, participant)) is not None
-        ]
+        """Return a list of ParticipationErrors that describe reasons for not being able to sign up."""
+        return self._run_checkers(participant, self._signup_checkers)
 
     @functools.lru_cache()
     def get_decline_errors(self, participant):
-        return [
-            error
-            for checker in self._decline_checkers
-            if (error := checker(self, participant)) is not None
-        ]
+        """Return a list of ParticipationErrors that describe reasons for not being able to decline."""
+        return self._run_checkers(participant, self._decline_checkers)
+
+    @functools.lru_cache()
+    def get_participant_errors(self, participant) -> List[ParticipationError]:
+        """
+        Return errors for whether the participant fulfills the requirements set by the signup methods for participation.
+        This runs a subset of the check for `get_signup_errors`.
+        """
+        return list(
+            filter(
+                lambda error: isinstance(error, ParticipantUnfitError),
+                self.get_signup_errors(participant),
+            )
+        )
 
     def can_decline(self, participant):
+        """
+        Return whether the participant is allowed to decline.
+        """
         return not self.get_decline_errors(participant)
 
     def can_sign_up(self, participant):
+        """
+        Return whether the participant is allowed to perform signup.
+        """
+        signupable_state = (
+            p := participant.participation_for(self.shift)
+        ) is None or not p.is_in_positive_state()
+        return signupable_state and not self.get_signup_errors(participant)
+
+    def can_customize_signup(self, participant):
+        """
+        Return whether the participant gets shown the option to customize their participation.
+        """
+        positive_state = (
+            p := participant.participation_for(self.shift)
+        ) is not None and p.is_in_positive_state()
+
+        if positive_state:
+            # If in positive state, check that you can decline and then sign up again.
+            return self.can_decline(participant) and not self.get_signup_errors(participant)
         return not self.get_signup_errors(participant)
 
-    def get_participation_for(self, participant):
+    def has_customized_signup(self, participation):
+        """
+        Return whether the participation was customized in a way specific to this signup method.
+        """
+        # This method should most likely check the participation's data attribute for modifications it has done.
+        # 'Customized' in this context means that the dispositioning person should give special attention to this participation.
+        return False
+
+    def get_participation_for(self, participant) -> AbstractParticipation:
         return participant.participation_for(self.shift) or participant.new_participation(
             self.shift
         )
 
-    def perform_signup(self, participant: AbstractParticipant, **kwargs) -> AbstractParticipation:
+    def perform_signup(
+        self, participant: AbstractParticipant, participation=None, **kwargs
+    ) -> AbstractParticipation:
         """
         Creates and/or configures a participation object for a given participant and sends out notifications.
-        Passes the participation and kwargs to configure_participation to do configuration specific to the signup method
+        Passes the participation and kwargs to configure_participation to do configuration specific to the signup method.
         """
-        from ephios.core.services.notifications.types import ResponsibleParticipationRequested
+        from ephios.core.services.notifications.types import (
+            ResponsibleParticipationRequestedNotification,
+        )
 
         if errors := self.get_signup_errors(participant):
             raise ParticipationError(errors)
-        participation = self._configure_participation(
-            self.get_participation_for(participant), **kwargs
-        )
+        participation = participation or self.get_participation_for(participant)
+        participation = self._configure_participation(participation, **kwargs)
         participation.save()
-        ResponsibleParticipationRequested.send(participation)
+        ResponsibleParticipationRequestedNotification(participation).send()
         return participation
 
-    def perform_decline(self, participant, **kwargs):
+    def perform_decline(self, participant, participation=None, **kwargs):
         """Create and configure a declining participation object for the given participant. `kwargs` may contain further instructions from a e.g. a form."""
         if errors := self.get_decline_errors(participant):
             raise ParticipationError(errors)
-        participation = self.get_participation_for(participant)
+        participation = participation or self.get_participation_for(participant)
         participation.state = AbstractParticipation.States.USER_DECLINED
         participation.save()
+        ResponsibleConfirmedParticipationDeclinedNotification(participation).send()
         return participation
 
     def _configure_participation(
@@ -411,52 +641,21 @@ def _configure_participation(
     ) -> AbstractParticipation:
         """
         Configure the given participation object for signup according to the method's configuration.
-        You need at least to set the participations state. `kwargs` may contain further instructions from e.g. a form.
+        You need at least to set the participations state, as that is not done with the participation form.
+        `kwargs` contains the signup form's cleaned_data.
         """
         raise NotImplementedError
 
-    def get_configuration_fields(self):
-        return OrderedDict(
-            {
-                "minimum_age": {
-                    "formfield": forms.IntegerField(required=False, min_value=1, max_value=999),
-                    "default": 16,
-                    "publish_with_label": _("Minimum age"),
-                },
-                "signup_until": {
-                    "formfield": forms.SplitDateTimeField(
-                        required=False, widget=CustomSplitDateTimeWidget
-                    ),
-                    "default": None,
-                    "publish_with_label": _("Signup until"),
-                    "format": functools.partial(
-                        formats.date_format, format="SHORT_DATETIME_FORMAT"
-                    ),
-                },
-                "user_can_decline_confirmed": {
-                    "formfield": forms.BooleanField(
-                        label=_("Confirmed users can decline by themselves"),
-                        required=False,
-                        help_text=_("only if the signup timeframe has not ended"),
-                    ),
-                    "default": False,
-                    "publish_with_label": _("Can decline after confirmation"),
-                    "format": yesno,
-                },
-            }
-        )
-
     def get_signup_info(self):
         """
         Return key/value pairs about the configuration to show in exports etc.
         """
-        fields = self.get_configuration_fields()
+        form_class = self.configuration_form_class
         return OrderedDict(
             {
-                label: field.get("format", str)(value)
-                for key, field in fields.items()
-                if (label := field.get("publish_with_label", False))
-                and (value := getattr(self.configuration, key))
+                label: getattr(form_class, f"format_{name}", format_anything)(value)
+                for name, field in form_class.base_fields.items()
+                if (label := field.label) and (value := getattr(self.configuration, name))
             }
         )
 
@@ -488,7 +687,36 @@ def get_signup_stats(self) -> "SignupStats":
             max_count=max_count,
         )
 
-    def render_shift_state(self, request):
+    def render(self, context):
+        """
+        Render the state/participations of the shift.
+        Match the signature of template.render for use with the include template tag:
+        {% include shift.signup_method %}
+        By default, this loads `shift_state_template_name` and renders it using context from `get_shift_state_context_data`.
+        """
+        with context.update(self.get_shift_state_context_data(context.request)):
+            return get_template(self.shift_state_template_name).template.render(context)
+
+    def get_shift_state_context_data(self, request, **kwargs):
+        """
+        Additionally to the context of the event detail view, provide context for rendering `shift_state_template_name`.
+        """
+        kwargs["shift"] = self.shift
+        kwargs["participations"] = self.shift.participations.filter(
+            state__in={
+                AbstractParticipation.States.REQUESTED,
+                AbstractParticipation.States.CONFIRMED,
+            }
+        ).order_by("-state")
+        if self.disposition_participation_form_class is not None:
+            kwargs["disposition_url"] = (
+                reverse("core:shift_disposition", kwargs=dict(pk=self.shift.pk))
+                if request.user.has_perm("core.change_event", obj=self.shift.event)
+                else None
+            )
+        return kwargs
+
+    def render_shift_state(self, context):
         """
         Render html that will be shown in the shift info box.
         Use it to inform about the current state of the shift and participations.
@@ -511,8 +739,6 @@ def get_configuration_form(self, *args, **kwargs):
         if self.shift is not None:
             kwargs.setdefault("initial", self.configuration.__dict__)
         form = self.configuration_form_class(*args, **kwargs)
-        for name, config in self.get_configuration_fields().items():
-            form.fields[name] = config["formfield"]
         return form
 
     def render_configuration_form(self, *args, form=None, **kwargs):
@@ -533,7 +759,7 @@ class SignupStats:
     max_count: Optional[int]  # None means infinite max
 
     @classproperty
-    def ZERO(self):
+    def ZERO(cls):  # pylint: disable=no-self-argument
         return SignupStats(
             requested_count=0,
             confirmed_count=0,
diff --git a/ephios/core/signup/participants.py b/ephios/core/signup/participants.py
new file mode 100644
index 000000000..daebe87d6
--- /dev/null
+++ b/ephios/core/signup/participants.py
@@ -0,0 +1,113 @@
+import dataclasses
+import functools
+from datetime import date
+from typing import Optional
+
+from django.contrib.auth import get_user_model
+from django.db.models import QuerySet
+from django.urls import reverse
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _
+
+from ephios.core.models import AbstractParticipation, LocalParticipation, Qualification
+from ephios.core.models.events import PlaceholderParticipation
+
+
+@dataclasses.dataclass(frozen=True)
+class AbstractParticipant:
+    first_name: str
+    last_name: str
+    qualifications: QuerySet = dataclasses.field(hash=False)
+    date_of_birth: Optional[date]
+    email: Optional[str]  # if set to None, no notifications are sent
+
+    def get_age(self, today: date = None):
+        if self.date_of_birth is None:
+            return None
+        today, born = today or date.today(), self.date_of_birth
+        return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
+
+    def __str__(self):
+        return f"{self.first_name} {self.last_name}"
+
+    def new_participation(self, shift):
+        raise NotImplementedError
+
+    def participation_for(self, shift):
+        """Return the participation object for a shift. Return None if it does not exist."""
+        raise NotImplementedError
+
+    def all_participations(self):
+        """Return all participations for this participant"""
+        raise NotImplementedError
+
+    @functools.lru_cache
+    def collect_all_qualifications(self) -> set:
+        return Qualification.collect_all_included_qualifications(self.qualifications)
+
+    def has_qualifications(self, qualifications):
+        return set(qualifications) <= self.collect_all_qualifications()
+
+    def reverse_signup_action(self, shift):
+        raise NotImplementedError
+
+    def reverse_event_detail(self, event):
+        raise NotImplementedError
+
+    @property
+    def icon(self):
+        return mark_safe('<span class="fa fa-user"></span>')
+
+
+@dataclasses.dataclass(frozen=True)
+class LocalUserParticipant(AbstractParticipant):
+    user: get_user_model()
+
+    def new_participation(self, shift):
+        return LocalParticipation(shift=shift, user=self.user)
+
+    def participation_for(self, shift):
+        try:
+            return LocalParticipation.objects.get(shift=shift, user=self.user)
+        except LocalParticipation.DoesNotExist:
+            return None
+
+    def all_participations(self):
+        return LocalParticipation.objects.filter(user=self.user)
+
+    def reverse_signup_action(self, shift):
+        return reverse("core:signup_action", kwargs=dict(pk=shift.pk))
+
+    def reverse_event_detail(self, event):
+        return event.get_absolute_url()
+
+
+@dataclasses.dataclass(frozen=True)
+class PlaceholderParticipant(AbstractParticipant):
+    def new_participation(self, shift):
+        return PlaceholderParticipation(
+            shift=shift, first_name=self.first_name, last_name=self.last_name
+        )
+
+    def participation_for(self, shift):
+        try:
+            return PlaceholderParticipation.objects.get(
+                shift=shift, first_name=self.first_name, last_name=self.last_name
+            )
+        except PlaceholderParticipation.DoesNotExist:
+            return None
+
+    def all_participations(self):
+        return AbstractParticipation.objects.none()
+
+    def reverse_signup_action(self, shift):
+        raise NotImplementedError
+
+    def reverse_event_detail(self, event):
+        raise NotImplementedError
+
+    @property
+    def icon(self):
+        return mark_safe(
+            f'<span class="fa fa-user-tag" data-toggle="tooltip" data-placement="left" title="{_("Placeholder")}"></span>'
+        )
diff --git a/ephios/core/templates/core/disposition/base_participation.html b/ephios/core/templates/core/disposition/base_participation.html
index 3fddb64c4..f5e4d3c58 100644
--- a/ephios/core/templates/core/disposition/base_participation.html
+++ b/ephios/core/templates/core/disposition/base_participation.html
@@ -1,5 +1,5 @@
 <div class="list-group-item draggable" data-formset-form data-participant-id="{{ form.instance.user.id }}">
-    {% block body %}
+    {% block participation_body %}
 
     {% endblock %}
     <div class="d-none">
diff --git a/ephios/core/templates/core/disposition/disposition.html b/ephios/core/templates/core/disposition/disposition.html
index a0530a731..d49d06d09 100644
--- a/ephios/core/templates/core/disposition/disposition.html
+++ b/ephios/core/templates/core/disposition/disposition.html
@@ -43,6 +43,7 @@ <h5 class="card-title d-flex align-items-center">
                             </div>
                             <div data-formset-spawn class="list-group sortable-reject-put list-group-flush flex-grow-1"
                                  data-drop-to-state="{{ states.GETTING_DISPATCHED }}">
+
                                 {% for form in formset %}
                                     {% if form.instance.state == states.GETTING_DISPATCHED %}
                                         {% include participant_template %}
@@ -119,4 +120,5 @@ <h5 class="card-title">{{ states.USER_DECLINED.label|capfirst }}</h5>
         <button type="submit" class="btn btn-primary float-end">{% translate "Save" %}</button>
     </form>
 
+
 {% endblock %}
diff --git a/ephios/core/templates/core/disposition/fragment_participation.html b/ephios/core/templates/core/disposition/fragment_participation.html
index 75c3a44fa..30978f8de 100644
--- a/ephios/core/templates/core/disposition/fragment_participation.html
+++ b/ephios/core/templates/core/disposition/fragment_participation.html
@@ -1,33 +1,62 @@
 {% extends "core/disposition/base_participation.html" %}
+{% load ephios_crispy %}
+{% load crispy_forms_filters %}
 {% load user_extras %}
 {% load i18n %}
 
-{% block body %}
-    <h6 class="mb-0">
-        <div class="row align-items-center no-gutters">
-            <div class="col-10 pe-3">
+{% block participation_body %}
+    <div class="row align-items-start no-gutters mb-0">
+        <div class="col-sm pe-3 pt-2 pb-1">
+            <h6 class="d-inline">
                 {{ form.instance.participant.icon }}
                 {{ form.instance.participant }}
-                {% with form.instance.participant|conflicting_shifts:shift as conflicting_shifts %}
-                    {% if conflicting_shifts %}
-                        <span class="fa fa-exclamation-triangle text-danger"
-                              data-bs-toggle="tooltip"
-                              title="{% blocktranslate trimmed with participant=form.instance.participant conflicts=conflicting_shifts|join:", " %}
+            </h6>
+            {% with form.instance|conflicting_participations as conflicts %}
+                {% if conflicts %}
+                    <span class="fa fa-exclamation-triangle text-danger"
+                          data-bs-toggle="tooltip"
+                          title="{% blocktranslate trimmed with participant=form.instance.participant conflicts=conflicts|join:", " %}
                                   {{ participant }} already participates in {{ conflicts }} at the same time.
                               {% endblocktranslate %}"></span>
-                    {% endif %}
-                {% endwith %}
-                {% for qualification in form.instance.participant.qualifications|get_relevant_qualifications %}
-                    <span class="badge bg-secondary text-dark">{{ qualification }}</span>
-                {% endfor %}
-            </div>
-            <div class="col-2 d-flex justify-content-between align-items-center">
-                {% if form.can_delete %}
-                    <button type="button" class="btn float-end btn-sm ms-3" data-formset-delete-button>
-                        <i class="fas fa-times"></i>
-                    </button>
                 {% endif %}
-            </div>
+            {% endwith %}
+            {% for qualification in form.instance.participant.qualifications|get_relevant_qualifications %}
+                <span class="badge bg-secondary text-dark">{{ qualification }}</span>
+            {% endfor %}
+
+            {% block participation_detail %}
+            {% endblock %}
+        </div>
+        <div class="col-sm-auto d-flex justify-content-between align-items-center">
+            {% block participation_controls %}
+            {% endblock %}
+            <button class="btn" type="button" data-bs-toggle="collapse"
+                    data-bs-target="#participation-collapse-{{ form.instance.id }}" aria-expanded="false"
+                    aria-controls="collapseExample">
+                    <span class="{% if form.instance.has_customized_signup %}text-dark{% else %}text-secondary{% endif %}">
+                        <i class="fas fa-cog"></i>
+                        <i class="fas fa-exclamation{% if not form.instance.has_customized_signup %} invisible{% endif %}"></i>
+                    </span>
+                <span class="visually-hidden">{% translate "Customize" %}</span>
+            </button>
+            {% if form.can_delete %}
+                <button type="button" class="btn float-end btn-sm ms-3" data-formset-delete-button>
+                    <i class="fas fa-times"></i>
+                </button>
+            {% endif %}
+        </div>
+    </div>
+    <div class="collapse mt-3 do-not-drag card bg-light" data-bs-parent="#participations-form"
+         id="participation-collapse-{{ form.instance.id }}">
+        <div class="card-body">
+            {{ form.individual_start_time|as_crispy_field }}
+            {{ form.individual_end_time|as_crispy_field }}
+            {% if form.comment.initial %}
+                {{ form.comment|as_crispy_field }}
+            {% endif %}
+            {% block participation_form %}
+            {% endblock %}
+            <div class="mb-n3"></div>
         </div>
-    </h6>
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/ephios/core/templates/core/event_detail.html b/ephios/core/templates/core/event_detail.html
index 999f28c5a..71dd6eae0 100644
--- a/ephios/core/templates/core/event_detail.html
+++ b/ephios/core/templates/core/event_detail.html
@@ -99,8 +99,8 @@ <h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
                 {% with start_time=event.get_start_time end_time=event.get_end_time %}
                     {% if start_time %}
                         <span class="text-muted d-inline-block">
-                        <i class="far fa-calendar"></i>
-                        {{ start_time|date:"D" }},
+                            <i class="far fa-calendar"></i>
+                            {{ start_time|date:"D" }},
                             {% if not event.is_multi_day %}
                                 {{ start_time|date:"SHORT_DATE_FORMAT" }}
                                 {{ start_time|date:"TIME_FORMAT" }} –
@@ -110,7 +110,7 @@ <h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
                                 {% translate "to" %}
                                 {{ end_time|date:"SHORT_DATE_FORMAT" }}
                             {% endif %}
-                    </span>
+                        </span>
                     {% endif %}
                 {% endwith %}
             </h5>
diff --git a/ephios/core/templates/core/fragments/shift_box_big.html b/ephios/core/templates/core/fragments/shift_box_big.html
index 94ea75079..9a3124654 100644
--- a/ephios/core/templates/core/fragments/shift_box_big.html
+++ b/ephios/core/templates/core/fragments/shift_box_big.html
@@ -1,25 +1,54 @@
-{% load static %}
 {% load event_extras %}
+{% load event_extras %}
+{% load static %}
 {% load i18n %}
 {% load humanize %}
 
 <div id="shift-{{ shift.pk }}" class="card h-100">
     <div class="card-header d-flex">
-        {% if not without_controls %}
-            {% with mannequin=request|shift_mannequin:shift %}
-                <div class="mannequin mannequin-{{ mannequin }}">
-                    <img src="{% static 'ephios/img/mannequin_'|add:mannequin|add:'.svg' %}"
-                         alt="{{ mannequin }} mannequin icon"/>
-                </div>
-            {% endwith %}
-        {% endif %}
-        <div class="lh-1 ms-2 flex-grow-1">
-            <small class="fw-bold">{{ shift.start_time|date:"l" }}, {{ shift.start_time|date:"SHORT_DATE_FORMAT" }}</small>
-            <br/>
-            <span class="fw-bold fs-2">{{ shift.start_time|time }} - {{ shift.end_time|time }}</span>
-            <small class="fw-bold text-muted d-inline-block">{{ shift.meeting_time|time }} {% translate "Meetup" %}</small>
-        </div>
-        {% if not without_controls and "change_event" in event_perms %}
+
+        {% setvar request|participation_from_request:shift as participation %}
+        {% with mannequin=participation|participation_mannequin_style style=participation|participation_css_style %}
+            <div class="mannequin mannequin-{{ mannequin }}">
+                <img src="{% static 'ephios/img/mannequin_'|add:mannequin|add:'.svg' %}"
+                     alt="{{ mannequin }} mannequin icon"/>
+            </div>
+            <div class="lh-1 ms-2 flex-grow-1">
+                <small class="fw-bold">
+                    {% if participation.start_time|date:"SHORT_DATE_FORMAT" != shift.start_time|date:"SHORT_DATE_FORMAT" and participation.is_in_positive_state %}
+                        <span class="text-{{ style }}" data-bs-toggle="tooltip" data-bs-placement="top"
+                              title="{% translate "originally" %} {{ shift.start_time|date:"l" }}, {{ shift.start_time|date:"SHORT_DATE_FORMAT" }}">
+                              {{ participation.start_time|date:"l" }}, {{ participation.start_time|date:"SHORT_DATE_FORMAT" }}
+                        </span>
+                    {% else %}
+                        {{ shift.start_time|date:"l" }}, {{ shift.start_time|date:"SHORT_DATE_FORMAT" }}
+                    {% endif %}
+                </small>
+                <br/>
+                <span class="fw-bold fs-2">
+                        {% if participation.individual_start_time and participation.is_in_positive_state %}
+                            <span class="text-{{ style }}" data-bs-toggle="tooltip" data-bs-placement="bottom"
+                                  title="{% translate "originally" %} {{ shift.start_time|time }}">{{ participation.start_time|time }}</span>
+                        {% else %}
+                            {{ shift.start_time|time }}
+                        {% endif %}
+                    -
+                    {% if participation.individual_end_time and participation.is_in_positive_state %}
+                        <span class="text-{{ style }}" data-bs-toggle="tooltip" data-bs-placement="bottom"
+                              title="{% translate "originally" %} {{ shift.end_time|time }}">{{ participation.end_time|time }}</span>
+                    {% else %}
+                        {{ shift.end_time|time }}
+                    {% endif %}
+                    </span>
+                <small class="fw-bold text-muted d-inline-block">
+                    <span class="d-inline-block">
+                        {{ shift.meeting_time|time }} {% translate "Meetup" %}
+                    </span>
+                </small>
+            </div>
+        {% endwith %}
+
+        {% if "change_event" in event_perms %}
             <div class="dropstart">
                 <button class="btn" type="button" id="actionDropdownButton"
                         data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -37,16 +66,23 @@
             </div>
         {% endif %}
     </div>
+
     <div class="card-body">
-        {% if not without_controls %}
-            {{ request|render_shift_state:shift }}
-        {% endif %}
+        {% include shift.signup_method with own_participation=participation %}
     </div>
+
     <div class="card-footer">
-        {% if event.active and not without_controls %}
-            {% with can_sign_up=request|can_sign_up:shift can_decline=request|can_decline:shift %}
+        {% if event.active %}
+            {% with can_sign_up=request|can_sign_up:shift can_decline=request|can_decline:shift can_customize_signup=request|can_customize_signup:shift %}
                 <form method="POST" class="form"
                       action="{{ request|reverse_signup_action:shift }}">
+
+                    {# If signup form is invalid, provide the shift times as initial values by including them in post data. #}
+                    <input type="hidden" name="individual_start_time_0" value="{{ shift.start_time|date:"Y-m-d" }}">
+                    <input type="hidden" name="individual_start_time_1" value="{{ shift.start_time|time:"H:i" }}">
+                    <input type="hidden" name="individual_end_time_0" value="{{ shift.end_time|date:"Y-m-d" }}">
+                    <input type="hidden" name="individual_end_time_1" value="{{ shift.end_time|time:"H:i" }}">
+
                     {% csrf_token %}
                     {% if can_sign_up and shift.signup_method.configuration.signup_until %}
                         <div class="text-success mb-1">
@@ -63,12 +99,21 @@
                             {% endfor %}
                         </div>
                     {% endif %}
-                    {% if can_sign_up %}
-                        <span class="d-inline-block" tabindex="0">
-                            <button type="submit" name="signup_choice" value="sign_up" class="btn btn-success">
-                                    {{ shift.signup_method.registration_button_text }}
-                            </button>
-                        </span>
+                    {% if can_sign_up and can_customize_signup %}
+                        <div class="btn-group">
+                            <button type="submit" name="signup_choice" value="sign_up"
+                                    class="btn btn-success">{{ shift.signup_method.registration_button_text }}</button>
+                            <a class="btn btn-success" href="{{ request|reverse_signup_action:shift }}">
+                                <i class="fas fa-cog"></i>
+                                <span class="visually-hidden">{% translate "Customize" %}</span>
+                            </a>
+                        </div>
+                    {% elif can_sign_up and not can_customize_signup %}
+                        <button type="submit" name="signup_choice" value="sign_up"
+                                class="btn btn-success">{{ shift.signup_method.registration_button_text }}</button>
+                    {% elif not can_sign_up and can_customize_signup %}
+                        <a class="btn btn-secondary"
+                           href="{{ request|reverse_signup_action:shift }}">{% translate "Customize" %}</a>
                     {% endif %}
                     {% if can_decline %}
                         <span class="d-inline-block" tabindex="1">
diff --git a/ephios/core/templates/core/home.html b/ephios/core/templates/core/home.html
index 22e169546..cc2aee771 100644
--- a/ephios/core/templates/core/home.html
+++ b/ephios/core/templates/core/home.html
@@ -19,19 +19,19 @@ <h1 class="page-header">
         {% trans "Welcome to ephios!" %}
     </h1>
 
-    {% with request.user|confirmed_shifts as confirmed_shifts %}
-        {% if confirmed_shifts|length > 0 %}
+    {% with request.user|confirmed_participations as confirmed_participations %}
+        {% if confirmed_participations|length > 0 %}
             <div class="card mb-3">
                 <div class="card-body">
                     <h5 class="card-title mb-0">{% trans "Your upcoming events" %}</h5>
                 </div>
                 <ul class="list-group list-group-flush">
-                    {% for shift in confirmed_shifts %}
+                    {% for participation in confirmed_participations %}
                         <li class="list-group-item flex-column">
                             <div class="d-flex w-100 justify-content-between align-items-center">
-                                <span>{{ shift.event.title }} ({{ shift.get_start_end_time_display }})</span>
+                                <span>{{ participation.shift.event.title }} ({{ participation.get_date_display }}, {{participation.get_time_display }})</span>
                                 <a class="btn btn-outline-primary btn-sm"
-                                   href="{{ shift.get_absolute_url }}"><span
+                                   href="{{ participation.shift.get_absolute_url }}"><span
                                         class="fa fa-eye"></span> <span
                                         class="d-none d-md-inline">{% translate "View" %}</span></a>
                             </div>
@@ -52,7 +52,7 @@ <h5 class="card-title mb-0">{% trans "Events with requested participations" %}</
                     {% for shift in shifts %}
                         <li class="list-group-item flex-column">
                             <div class="d-flex w-100 justify-content-between align-items-center">
-                                <span class="">{{ shift.event.title }} ({{ shift.get_start_end_time_display }})</span>
+                                <span class="">{{ shift.event.title }} ({{ shift.get_datetime_display }})</span>
                                 <div>
                                     <a class="btn btn-outline-primary btn-sm"
                                        href="{% url "core:event_detail" shift.event.pk shift.event.get_canonical_slug %}"><span
diff --git a/ephios/core/templates/core/mails/new_event.html b/ephios/core/templates/core/mails/new_event.html
index 0cc10e901..c4c8dfb4b 100644
--- a/ephios/core/templates/core/mails/new_event.html
+++ b/ephios/core/templates/core/mails/new_event.html
@@ -3,12 +3,25 @@
 
 {% block content %}
     <h1>{{ event.type }} {% translate "added" %}: {{ event.title }}</h1>
+    {% with start_time=event.get_start_time end_time=event.get_end_time %}
+        {% if start_time %}
+            <h2>
+                {{ start_time|date:"D" }},
+                {% if not event.is_multi_day %}
+                    {{ start_time|date:"SHORT_DATE_FORMAT" }}
+                    {{ start_time|date:"TIME_FORMAT" }} –
+                    {{ end_time|date:"TIME_FORMAT" }}
+                {% else %}
+                    {{ start_time|date:"SHORT_DATE_FORMAT" }}
+                    {% translate "to" %}
+                    {{ end_time|date:"SHORT_DATE_FORMAT" }}
+                {% endif %}
+            </h2>
+        {% endif %}
+    {% endwith %}
     <div>
-        {{ event.description }}
-        {% translate "Location" %}: {{ event.location }}
+        {{ event.description }}<br/>
+        {% translate "Location" %}: {{ event.location }}<br/>
         <a href="{{ site_url }}{{ event.get_absolute_url }}">{% translate "View" %}</a>
     </div>
-    {% for shift in event.shifts.all %}
-        {% include "core/fragments/../fragments/shift_box_big.html" with shift=shift without_controls=True %}
-    {% endfor %}
 {% endblock %}
diff --git a/ephios/core/templates/core/signup.html b/ephios/core/templates/core/signup.html
new file mode 100644
index 000000000..5c18e480d
--- /dev/null
+++ b/ephios/core/templates/core/signup.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+{% load static %}
+
+{% block title %}
+    {% translate "Signup" %}
+{% endblock %}
+
+{% block content %}
+    <div class="page-header">
+        <h1>{{ view.shift }}</h1>
+    </div>
+
+    {% crispy form %}
+{% endblock %}
diff --git a/ephios/core/templatetags/event_extras.py b/ephios/core/templatetags/event_extras.py
index 7707b0311..8fed17e7b 100644
--- a/ephios/core/templatetags/event_extras.py
+++ b/ephios/core/templatetags/event_extras.py
@@ -1,4 +1,5 @@
 import collections
+import operator
 from functools import reduce
 
 from django import template
@@ -6,7 +7,7 @@
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 
-from ephios.core.models import AbstractParticipation, EventType, LocalParticipation
+from ephios.core.models import AbstractParticipation, EventType, LocalParticipation, UserProfile
 from ephios.core.signals import register_event_bulk_action
 from ephios.core.views.signup import request_to_participant
 from ephios.extra.colors import get_eventtype_color_style
@@ -19,10 +20,27 @@ def reverse_signup_action(request, shift):
     return request_to_participant(request).reverse_signup_action(shift)
 
 
-@register.filter(name="shift_mannequin")
-def shift_mannequin(request, shift):
-    participation = request_to_participant(request).participation_for(shift)
-    if participation is not None:
+@register.filter(name="participation_from_request")
+def participation_from_request(request, shift):
+    return request_to_participant(request).participation_for(shift)
+
+
+@register.filter(name="participation_css_style")
+def participation_css_style(participation):
+    if participation:
+        return {
+            AbstractParticipation.States.USER_DECLINED: "danger",
+            AbstractParticipation.States.RESPONSIBLE_REJECTED: "danger",
+            AbstractParticipation.States.REQUESTED: "warning",
+            AbstractParticipation.States.CONFIRMED: "success",
+            AbstractParticipation.States.GETTING_DISPATCHED: "(invalid)",
+        }[participation.state]
+    return "(invalid)"
+
+
+@register.filter(name="participation_mannequin_style")
+def participation_mannequin_style(participation):
+    if participation:
         return {
             AbstractParticipation.States.USER_DECLINED: "denied",
             AbstractParticipation.States.RESPONSIBLE_REJECTED: "denied",
@@ -33,11 +51,27 @@ def shift_mannequin(request, shift):
     return "neutral"
 
 
+@register.simple_tag
+def setvar(value=None):
+    """
+    as an alternative to using with blocks and template, use
+    `{% setvar value|filter:param as var %}` to save a value to a variable in a template.
+    The builtin `firstof` doesn't work, because it converts values to strings.
+    From here: https://pythoncircle.com/post/701/how-to-set-a-variable-in-django-template/
+    """
+    return value
+
+
 @register.filter(name="can_sign_up")
 def can_sign_up(request, shift):
     return shift.signup_method.can_sign_up(request_to_participant(request))
 
 
+@register.filter(name="can_customize_signup")
+def can_customize_signup(request, shift):
+    return shift.signup_method.can_customize_signup(request_to_participant(request))
+
+
 @register.filter(name="render_shift_state")
 def render_shift_state(request, shift):
     return shift.signup_method.render_shift_state(request)
@@ -56,12 +90,15 @@ def can_decline(request, shift):
     return shift.signup_method.can_decline(request_to_participant(request))
 
 
-@register.filter(name="confirmed_shifts")
-def confirmed_shifts(user):
-    return (
-        user.get_shifts(with_participation_state_in=[AbstractParticipation.States.CONFIRMED])
+@register.filter(name="confirmed_participations")
+def confirmed_participations(user: UserProfile):
+    # can't use order_by, as postgres gets confused when using the
+    # `start_time` coalesce, the shift select related and order_by on start_time at the same time.
+    return sorted(
+        user.participations.filter(state=AbstractParticipation.States.CONFIRMED)
         .filter(end_time__gte=timezone.now())
-        .order_by("start_time")
+        .select_related("shift", "shift__event"),
+        key=operator.attrgetter("start_time", "end_time"),
     )
 
 
diff --git a/ephios/core/templatetags/user_extras.py b/ephios/core/templatetags/user_extras.py
index c60d53f76..f927be075 100644
--- a/ephios/core/templatetags/user_extras.py
+++ b/ephios/core/templatetags/user_extras.py
@@ -6,7 +6,7 @@
 
 from ephios.core.consequences import editable_consequences, pending_consequences
 from ephios.core.models import AbstractParticipation, Shift
-from ephios.core.signup import get_conflicting_participations
+from ephios.core.signup.methods import get_conflicting_participations
 
 register = template.Library()
 
@@ -46,11 +46,14 @@ def get_relevant_qualifications(qualification_queryset):
     return qs.values_list("abbreviation", flat=True)
 
 
-@register.filter(name="conflicting_shifts")
-def participant_conflicting_shifts(participant, shift):
-    return get_conflicting_participations(shift, participant).values_list(
-        "shift__event__title", flat=True
-    )
+@register.filter(name="conflicting_participations")
+def participation_conflicts(participation):
+    return get_conflicting_participations(
+        participant=participation.participant,
+        shift=participation.shift,
+        start_time=participation.start_time,
+        end_time=participation.end_time,
+    ).values_list("shift__event__title", flat=True)
 
 
 @register.filter(name="shifts_needing_disposition")
diff --git a/ephios/core/urls.py b/ephios/core/urls.py
index e478cf289..8a2250e68 100644
--- a/ephios/core/urls.py
+++ b/ephios/core/urls.py
@@ -110,7 +110,7 @@
         name="event_bulk_delete",
     ),
     path(
-        "shifts/<int:pk>/signup-action/",
+        "shifts/<int:pk>/signup/",
         LocalUserShiftActionView.as_view(),
         name="signup_action",
     ),
diff --git a/ephios/core/views/eventtype.py b/ephios/core/views/eventtype.py
index 42df5a2e4..a479de498 100644
--- a/ephios/core/views/eventtype.py
+++ b/ephios/core/views/eventtype.py
@@ -74,9 +74,9 @@ class EventTypeCreateView(
     accept_object_perms = False
     template_name = "core/eventtype_form.html"
     model = EventType
-    fields = ["title", "can_grant_qualification"]
+    fields = ["title"]
     success_message = _(
-        "Eventtype succesfully created. More settings for this eventtype can be managed below. "
+        "Event type was created. More settings for this event type can be managed below."
     )
 
     def get_success_url(self):
diff --git a/ephios/core/views/shift.py b/ephios/core/views/shift.py
index 4f3e0f284..2e879e746 100644
--- a/ephios/core/views/shift.py
+++ b/ephios/core/views/shift.py
@@ -9,9 +9,9 @@
 from django.views.generic import DeleteView, TemplateView
 from django.views.generic.detail import SingleObjectMixin
 
-from ephios.core import signup
 from ephios.core.forms.events import ShiftForm
 from ephios.core.models import Event, Shift
+from ephios.core.signup.methods import enabled_signup_methods, signup_method_from_slug
 from ephios.extra.mixins import CustomPermissionRequiredMixin
 
 
@@ -37,14 +37,13 @@ def get_context_data(self, **kwargs):
 
     def post(self, *args, **kwargs):
         form = self.get_shift_form()
-        try:
-            from ephios.core.signup import signup_method_from_slug
 
+        try:
             signup_method = signup_method_from_slug(
                 self.request.POST["signup_method_slug"], event=self.event
             )
         except KeyError:
-            if not list(signup.enabled_signup_methods()):
+            if not list(enabled_signup_methods()):
                 form.add_error(
                     "signup_method_slug",
                     _("You must enable plugins providing signup methods to continue."),
@@ -93,8 +92,6 @@ class ShiftConfigurationFormView(CustomPermissionRequiredMixin, SingleObjectMixi
     pk_url_kwarg = "event_id"
 
     def get(self, request, *args, **kwargs):
-        from ephios.core.signup import signup_method_from_slug
-
         signup_method = signup_method_from_slug(self.kwargs.get("slug"), event=self.get_object())
         return HttpResponse(signup_method.render_configuration_form())
 
@@ -132,16 +129,15 @@ def get_context_data(self, **kwargs):
     def post(self, *args, **kwargs):
         self.object = self.get_object()
         form = self.get_shift_form()
-        try:
-            from ephios.core.signup import signup_method_from_slug
 
+        try:
             signup_method = signup_method_from_slug(
                 self.request.POST["signup_method_slug"], shift=self.object
             )
             configuration_form = signup_method.get_configuration_form(self.request.POST)
         except ValueError as e:
             raise ValidationError(e) from e
-        if form.is_valid() and configuration_form.is_valid():
+        if all([form.is_valid(), configuration_form.is_valid()]):
             shift = form.save(commit=False)
             shift.signup_configuration = configuration_form.cleaned_data
             shift.save()
diff --git a/ephios/core/views/signup.py b/ephios/core/views/signup.py
index 4b40268c9..68acffc55 100644
--- a/ephios/core/views/signup.py
+++ b/ephios/core/views/signup.py
@@ -2,14 +2,14 @@
 from django.views.generic.detail import SingleObjectMixin
 
 from ephios.core.models import Shift
-from ephios.core.signup import get_nonlocal_participant_from_session
+from ephios.core.signup.methods import get_nonlocal_participant_from_request
 from ephios.extra.mixins import CustomPermissionRequiredMixin
 
 
 def request_to_participant(request):
     if request.user.is_authenticated:
         return request.user.as_participant()
-    return get_nonlocal_participant_from_session(request)
+    return get_nonlocal_participant_from_request(request)
 
 
 class BaseShiftActionView(SingleObjectMixin, View):
diff --git a/ephios/extra/management/commands/devdata.py b/ephios/extra/management/commands/devdata.py
index 9a11d44d7..ba2c67422 100644
--- a/ephios/extra/management/commands/devdata.py
+++ b/ephios/extra/management/commands/devdata.py
@@ -49,8 +49,8 @@ def create_objects():
     assign_perm("auth.change_group", managers)
     assign_perm("auth.delete_group", managers)
 
-    service_type = EventType.objects.create(title=_("Service"), can_grant_qualification=False)
-    EventType.objects.create(title=_("Training"), can_grant_qualification=True)
+    service_type = EventType.objects.create(title=_("Service"))
+    EventType.objects.create(title=_("Training"))
 
     user = UserProfile(
         email="user@localhost",
diff --git a/ephios/core/templates/core/fragments/custom_date_input.html b/ephios/extra/templates/extra/widgets/custom_date_input.html
similarity index 100%
rename from ephios/core/templates/core/fragments/custom_date_input.html
rename to ephios/extra/templates/extra/widgets/custom_date_input.html
diff --git a/ephios/core/templates/core/fragments/custom_split_date_time_widget.html b/ephios/extra/templates/extra/widgets/custom_split_date_time_widget.html
similarity index 100%
rename from ephios/core/templates/core/fragments/custom_split_date_time_widget.html
rename to ephios/extra/templates/extra/widgets/custom_split_date_time_widget.html
diff --git a/ephios/core/templates/core/fragments/custom_time_input.html b/ephios/extra/templates/extra/widgets/custom_time_input.html
similarity index 100%
rename from ephios/core/templates/core/fragments/custom_time_input.html
rename to ephios/extra/templates/extra/widgets/custom_time_input.html
diff --git a/ephios/extra/utils.py b/ephios/extra/utils.py
index 5e932f063..49b257854 100644
--- a/ephios/extra/utils.py
+++ b/ephios/extra/utils.py
@@ -1,8 +1,36 @@
+import datetime
 import itertools
 
+from django.db import models
+from django.template.defaultfilters import yesno
+from django.utils import formats
+from django.utils.translation import gettext_lazy as _
+
+# This file includes some of the itertools recipes from https://docs.python.org/3/library/itertools.html
+
 
 def pairwise(iterable):
     "s -> (s0,s1), (s1,s2), (s2, s3), ..."
     a, b = itertools.tee(iterable)
     next(b, None)
     return zip(a, b)
+
+
+def partition(pred, iterable):
+    "Use a predicate to partition entries into false entries and true entries"
+    # partition(is_odd, range(10)) --> 0 2 4 6 8   and  1 3 5 7 9
+    t1, t2 = itertools.tee(iterable)
+    return itertools.filterfalse(pred, t1), filter(pred, t2)
+
+
+def format_anything(value):
+    """Return some inbuilt types in a human readable way."""
+    if isinstance(value, bool):
+        return yesno(value)
+    if isinstance(value, datetime.datetime):
+        return formats.date_format(value, format="SHORT_DATETIME_FORMAT")
+    if isinstance(value, models.QuerySet):
+        return ", ".join(str(e) for e in value)
+    if value is None:
+        return _("None")
+    return str(value)
diff --git a/ephios/extra/widgets.py b/ephios/extra/widgets.py
index f0bbed1e6..4f0b49c9c 100644
--- a/ephios/extra/widgets.py
+++ b/ephios/extra/widgets.py
@@ -4,7 +4,7 @@
 
 
 class CustomDateInput(DateInput):
-    template_name = "core/fragments/custom_date_input.html"
+    template_name = "extra/widgets/custom_date_input.html"
 
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("format", "%Y-%m-%d")
@@ -12,7 +12,7 @@ def __init__(self, *args, **kwargs):
 
 
 class CustomTimeInput(TimeInput):
-    template_name = "core/fragments/custom_time_input.html"
+    template_name = "extra/widgets/custom_time_input.html"
 
 
 class CustomSplitDateTimeInput(SplitDateTimeWidget):
@@ -26,7 +26,7 @@ class CustomSplitDateTimeWidget(MultiWidget):
     """
 
     supports_microseconds = False
-    template_name = "core/fragments/custom_split_date_time_widget.html"
+    template_name = "extra/widgets/custom_split_date_time_widget.html"
 
     def __init__(self, *args, **kwargs):
         widgets = (
diff --git a/ephios/plugins/basesignup/signals.py b/ephios/plugins/basesignup/signals.py
index a66996798..60229cbc0 100644
--- a/ephios/plugins/basesignup/signals.py
+++ b/ephios/plugins/basesignup/signals.py
@@ -1,6 +1,6 @@
 from django.dispatch import receiver
 
-from ephios.core.signup import register_signup_methods
+from ephios.core.signup.methods import register_signup_methods
 from ephios.plugins.basesignup.signup.coupled_signup import CoupledSignupMethod
 from ephios.plugins.basesignup.signup.instant import InstantConfirmationSignupMethod
 from ephios.plugins.basesignup.signup.no_selfservice import NoSelfserviceSignupMethod
diff --git a/ephios/plugins/basesignup/signup/common.py b/ephios/plugins/basesignup/signup/common.py
index d3f6b4cee..09809c7a5 100644
--- a/ephios/plugins/basesignup/signup/common.py
+++ b/ephios/plugins/basesignup/signup/common.py
@@ -1,15 +1,16 @@
 import typing
-from collections import OrderedDict
 
 from django import forms
-from django.template.loader import get_template
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_select2.forms import Select2MultipleWidget
 from dynamic_preferences.registries import global_preferences_registry
 
 from ephios.core.models import AbstractParticipation, Qualification
-from ephios.core.signup import BaseSignupMethod, ParticipationError
+from ephios.core.signup.methods import (
+    BaseSignupMethod,
+    ParticipantUnfitError,
+    SignupDisallowedError,
+)
 
 _Base = BaseSignupMethod if typing.TYPE_CHECKING else object
 
@@ -33,7 +34,7 @@ def check_maximum_number_of_participants(method, participant):
                 ]
             )
             if current_count >= method.configuration.maximum_number_of_participants:
-                return ParticipationError(_("The maximum number of participants is reached."))
+                return SignupDisallowedError(_("The maximum number of participants is reached."))
 
     def get_participant_count_bounds(self):
         return (
@@ -41,39 +42,28 @@ def get_participant_count_bounds(self):
             self.configuration.maximum_number_of_participants,
         )
 
-    def get_configuration_fields(self):
-        return OrderedDict(
-            {
-                **super().get_configuration_fields(),
-                "minimum_number_of_participants": {
-                    "formfield": forms.IntegerField(min_value=0, required=False),
-                    "default": None,
-                },
-                "maximum_number_of_participants": {
-                    "formfield": forms.IntegerField(min_value=1, required=False),
-                    "default": None,
-                },
-            }
-        )
+    @property
+    def configuration_form_class(self):
+        class ConfigurationForm(super().configuration_form_class):
+            minimum_number_of_participants = forms.IntegerField(
+                label=_("Minimum number of participants"), min_value=0, required=False
+            )
+            maximum_number_of_participants = forms.IntegerField(
+                label=_("Maximum number of participants"), min_value=1, required=False
+            )
 
-    def get_participation_number_info(self):
-        min_count = self.configuration.minimum_number_of_participants
-        max_count = self.configuration.maximum_number_of_participants
-        if min_count is None and max_count is None:
-            return None
-        if min_count == max_count:
-            return str(min_count)
-        if min_count is not None and max_count is not None:
-            return _("{min} to {max}").format(min=min_count, max=max_count)
-        if min_count is not None:
-            return _("at least {min}").format(min=min_count)
-        return _("at most {max}").format(max=max_count)
-
-    def get_signup_info(self):
-        infos = super().get_signup_info()
-        if number_info := self.get_participation_number_info():
-            infos[_("Required number of participants")] = number_info
-        return infos
+        return ConfigurationForm
+
+    def get_shift_state_context_data(self, request, **kwargs):
+        context_data = super().get_shift_state_context_data(request, **kwargs)
+        context_data["empty_spots"] = range(
+            max(
+                0,
+                (getattr(self.configuration, "minimum_number_of_participants", None) or 0)
+                - len(context_data["participations"]),
+            )
+        )
+        return context_data
 
 
 class QualificationsRequiredSignupMixin(_Base):
@@ -85,81 +75,57 @@ def __init__(self, shift, **kwargs):
             )
 
     @property
-    def _signup_checkers(self):
-        return super()._signup_checkers + [self.check_qualification]
+    def _participant_checkers(self):
+        return super()._participant_checkers + [self.check_qualification]
 
     @staticmethod
     def check_qualification(method, participant):
         if not participant.has_qualifications(method.configuration.required_qualifications):
-            return ParticipationError(_("You are not qualified."))
-
-    def get_configuration_fields(self):
-        return OrderedDict(
-            {
-                **super().get_configuration_fields(),
-                "required_qualification_ids": {
-                    "formfield": forms.ModelMultipleChoiceField(
-                        label=_("Required Qualifications"),
-                        queryset=Qualification.objects.all(),
-                        widget=Select2MultipleWidget,
-                        required=False,
-                    ),
-                    "default": [],
-                    "publish_with_label": _("Required Qualification"),
-                    "format": lambda ids: ", ".join(
-                        Qualification.objects.filter(id__in=ids).values_list("title", flat=True)
-                    ),
-                },
-            }
-        )
+            return ParticipantUnfitError(_("You are not qualified."))
 
+    @property
+    def configuration_form_class(self):
+        class ConfigurationForm(super().configuration_form_class):
+            required_qualification_ids = forms.ModelMultipleChoiceField(
+                label=_("Required Qualifications"),
+                queryset=Qualification.objects.all(),
+                widget=Select2MultipleWidget,
+                required=False,
+                initial=[],
+            )
 
-def render_basic_participation_pills_shift_state(method, request, additional_context=None):
-    participations = method.shift.participations.filter(
-        state__in={
-            AbstractParticipation.States.REQUESTED,
-            AbstractParticipation.States.CONFIRMED,
-        }
-    ).order_by("-state")
-    empty_spots = max(
-        0,
-        (getattr(method.configuration, "minimum_number_of_participants", None) or 0)
-        - len(participations),
-    )
-    additional_context = additional_context or {}
-    return get_template("basesignup/fragment_state_common.html").render(
-        {
-            "shift": method.shift,
-            "participations": participations,
-            "empty_spots": list(range(empty_spots)),
-            "disposition_url": (
-                reverse("core:shift_disposition", kwargs=dict(pk=method.shift.pk))
-                if request.user.has_perm("core.change_event", obj=method.shift.event)
-                else None
+            @staticmethod
+            def format_required_qualification_ids(ids):
+                return ", ".join(
+                    Qualification.objects.filter(id__in=ids).values_list("title", flat=True)
+                )
+
+        return ConfigurationForm
+
+    def get_shift_state_context_data(self, request, **kwargs):
+        return super().get_shift_state_context_data(
+            request,
+            **kwargs,
+            required_qualification=", ".join(
+                q.abbreviation for q in self.configuration.required_qualifications
             ),
-            **additional_context,
-        }
-    )
+        )
+
+
+class RenderParticipationPillsShiftStateMixin:
+    shift_state_template_name = "basesignup/fragment_participation_pills_shift_state.html"
 
 
 class QualificationMinMaxBaseSignupMethod(
-    QualificationsRequiredSignupMixin, MinMaxParticipantsMixin, BaseSignupMethod
+    RenderParticipationPillsShiftStateMixin,
+    QualificationsRequiredSignupMixin,
+    MinMaxParticipantsMixin,
+    BaseSignupMethod,
 ):
     @property
     def slug(self):
         raise NotImplementedError()
 
-    def render_shift_state(self, request):
-        return render_basic_participation_pills_shift_state(
-            self,
-            request,
-            {
-                "required_qualification": ", ".join(
-                    q.abbreviation for q in self.configuration.required_qualifications
-                ),
-            },
-        )
-
     def get_participation_display(self):
         relevant_qualification_categories = global_preferences_registry.manager()[
             "general__relevant_qualification_categories"
diff --git a/ephios/plugins/basesignup/signup/coupled_signup.py b/ephios/plugins/basesignup/signup/coupled_signup.py
index b36d2b672..333969394 100644
--- a/ephios/plugins/basesignup/signup/coupled_signup.py
+++ b/ephios/plugins/basesignup/signup/coupled_signup.py
@@ -7,30 +7,33 @@
 from django.utils.translation import gettext_lazy as _
 
 from ephios.core.models import AbstractParticipation, Shift
-from ephios.core.signup import BaseSignupMethod, ParticipationError
-from ephios.plugins.basesignup.signup.common import render_basic_participation_pills_shift_state
+from ephios.core.signup.methods import ActionDisallowedError, BaseSignupMethod
+from ephios.plugins.basesignup.signup.common import RenderParticipationPillsShiftStateMixin
 
 
-class CoupledSignupMethod(BaseSignupMethod):
+class CoupledSignupMethod(RenderParticipationPillsShiftStateMixin, BaseSignupMethod):
     slug = "coupled"
     verbose_name = _("coupled to another shift")
     description = _("""This method mirrors signup from another shift.""")
     uses_requested_state = True
 
-    def get_configuration_fields(self):
-        return {
-            "leader_shift_id": {
-                "formfield": forms.ModelChoiceField(
-                    label=_("shift to mirror participation from"),
-                    required=True,
-                    queryset=self.event.shifts.exclude(
-                        Q(pk__in=[self.shift.id] if self.shift else [])
-                        | Q(signup_method_slug=self.slug)  # no chaining/no cycles!
-                    ),
+    @property
+    def configuration_form_class(self):
+        class ConfigurationForm(super().configuration_form_class):
+            leader_shift_id = forms.ModelChoiceField(
+                label=_("shift to mirror participation from"),
+                required=True,
+                queryset=self.event.shifts.exclude(
+                    Q(pk__in=[self.shift.id] if self.shift else [])
+                    | Q(signup_method_slug=self.slug)  # no chaining/no cycles!
                 ),
-                "default": None,
-            },
-        }
+            )
+
+            @staticmethod
+            def format_leader_shift_id(value):
+                return str(Shift.objects.get(id=value) if isinstance(value, int) else value)
+
+        return ConfigurationForm
 
     def _configure_participation(
         self, participation: AbstractParticipation, **kwargs
@@ -49,11 +52,11 @@ def leader_shift(self):
     @staticmethod
     def signup_is_disabled(method, participant):
         if method.leader_shift:
-            return ParticipationError(
+            return ActionDisallowedError(
                 _("Participation is coupled to {}.").format(method.leader_shift)
             )
         # This is red as it requires responsibles to update the shift configuration.
-        return ParticipationError(
+        return ActionDisallowedError(
             mark_safe(
                 f'<span class="text-danger">{_("Participation is coupled to another shift, but the leading shift is missing.")}</span>'
             )
@@ -71,14 +74,6 @@ def _decline_checkers(self):
             self.signup_is_disabled,
         ]
 
-    def render_shift_state(self, request):
-        """If leader shift is available, copy that. Otherwise do the basic pills with a warning."""
-        if self.leader_shift:
-            return self.leader_shift.signup_method.render_shift_state(request)
-        return render_basic_participation_pills_shift_state(
-            self, request, {"disposition_url": None}
-        )
-
 
 @receiver(pre_save)
 def update_coupled_shifts(sender, instance, **kwargs):
diff --git a/ephios/plugins/basesignup/signup/no_selfservice.py b/ephios/plugins/basesignup/signup/no_selfservice.py
index c73f02c81..174d506e3 100644
--- a/ephios/plugins/basesignup/signup/no_selfservice.py
+++ b/ephios/plugins/basesignup/signup/no_selfservice.py
@@ -2,26 +2,26 @@
 from django.utils.translation import gettext_lazy as _
 
 from ephios.core.models import AbstractParticipation
-from ephios.core.signup import BaseSignupMethod, ParticipationError
-from ephios.plugins.basesignup.signup.common import render_basic_participation_pills_shift_state
+from ephios.core.signup.methods import ActionDisallowedError, BaseSignupMethod
+from ephios.plugins.basesignup.signup.common import RenderParticipationPillsShiftStateMixin
 
 
-class NoSelfserviceSignupMethod(BaseSignupMethod):
+class NoSelfserviceSignupMethod(RenderParticipationPillsShiftStateMixin, BaseSignupMethod):
     slug = "no_selfservice"
     verbose_name = _("No Signup (only disposition)")
     description = _("""This method allows no signup by users.""")
     uses_requested_state = False
 
-    def get_configuration_fields(self):
-        return {
-            "no_selfservice_explanation": {
-                "formfield": forms.CharField(
-                    label=_("Explanation"),
-                    required=False,
-                ),
-                "default": "",
-            },
-        }
+    @property
+    def configuration_form_class(self):
+        class ConfigurationForm(super().configuration_form_class):
+            no_selfservice_explanation = forms.CharField(
+                label=_("Explanation"),
+                required=False,
+                initial="",
+            )
+
+        return ConfigurationForm
 
     def _configure_participation(
         self, participation: AbstractParticipation, **kwargs
@@ -30,7 +30,7 @@ def _configure_participation(
 
     @staticmethod
     def signup_is_disabled(method, participant):
-        return ParticipationError(
+        return ActionDisallowedError(
             method.configuration.no_selfservice_explanation
             or _("Signup for this shift is disabled.")
         )
@@ -46,6 +46,3 @@ def _decline_checkers(self):
         return [
             self.signup_is_disabled,
         ]
-
-    def render_shift_state(self, request):
-        return render_basic_participation_pills_shift_state(self, request)
diff --git a/ephios/plugins/basesignup/signup/section_based.py b/ephios/plugins/basesignup/signup/section_based.py
index 4872c847f..b9b0c4538 100644
--- a/ephios/plugins/basesignup/signup/section_based.py
+++ b/ephios/plugins/basesignup/signup/section_based.py
@@ -5,24 +5,21 @@
 from operator import itemgetter
 
 from django import forms
-from django.contrib import messages
 from django.core.exceptions import ValidationError
-from django.shortcuts import redirect
 from django.template.loader import get_template
-from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import FormView
 from django_select2.forms import Select2MultipleWidget
 from dynamic_preferences.registries import global_preferences_registry
 
 from ephios.core.models import AbstractParticipation, Qualification
-from ephios.core.signup import (
-    AbstractParticipant,
-    BaseDispositionParticipationForm,
+from ephios.core.signup.disposition import BaseDispositionParticipationForm
+from ephios.core.signup.methods import (
+    BaseSignupForm,
     BaseSignupMethod,
     BaseSignupView,
-    ParticipationError,
+    ParticipantUnfitError,
 )
+from ephios.core.signup.participants import AbstractParticipant
 
 NO_SECTION_UUID = "other"
 
@@ -37,7 +34,7 @@ def sections_participant_qualifies_for(sections, participant: AbstractParticipan
 
 
 class SectionBasedDispositionParticipationForm(BaseDispositionParticipationForm):
-    disposition_participation_template = "basesignup/section_based/fragment_participant.html"
+    disposition_participation_template = "basesignup/section_based/fragment_participation.html"
 
     section = forms.ChoiceField(
         label=_("Section"),
@@ -119,7 +116,20 @@ def clean_uuid(self):
 )
 
 
-class SectionBasedConfigurationForm(forms.Form):
+class SectionBasedConfigurationForm(BaseSignupMethod.configuration_form_class):
+    choose_preferred_section = forms.BooleanField(
+        label=_("Participants must provide a preferred section"),
+        help_text=_("This only makes sense if you configure multiple sections."),
+        widget=forms.CheckboxInput,
+        required=False,
+        initial=False,
+    )
+    sections = forms.Field(
+        label=_("Structure"),
+        widget=forms.HiddenInput,
+        required=False,
+    )
+
     def __init__(self, data=None, **kwargs):
         super().__init__(data, **kwargs)
         self.sections_formset = SectionsFormset(
@@ -142,18 +152,45 @@ def clean_sections(self):
         ]
         return sections
 
+    @staticmethod
+    def format_sections(value):
+        return ", ".join(section["title"] for section in value)
 
-class SectionSignupForm(forms.Form):
-    section = forms.ChoiceField(
+
+class SectionSignupForm(BaseSignupForm):
+    preferred_section_uuid = forms.ChoiceField(
         label=_("Preferred Section"),
         widget=forms.RadioSelect,
         required=False,
-        # choices are set as (uuid, title) of section
+        # choices are later set as (uuid, title) of section
     )
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["preferred_section_uuid"].initial = self.instance.data.get(
+            "preferred_section_uuid"
+        )
+        self.fields["preferred_section_uuid"].required = (
+            self.data.get("signup_choice") == "sign_up"
+            and self.method.configuration.choose_preferred_section
+        )
+        self.fields["preferred_section_uuid"].choices = [
+            (section["uuid"], section["title"])
+            for section in self.sections_participant_qualifies_for
+        ]
+        unqualified = [
+            section
+            for section in self.method.configuration.sections
+            if section not in self.sections_participant_qualifies_for
+        ]
+        if unqualified:
+            self.fields["preferred_section_uuid"].help_text = _(
+                "You don't qualify for {qualifications}."
+            ).format(qualifications=", ".join(str(section["title"]) for section in unqualified))
 
-class SectionBasedSignupView(FormView, BaseSignupView):
-    template_name = "basesignup/section_based/signup.html"
+    def save(self, commit=True):
+        self.instance.data["preferred_section_uuid"] = self.cleaned_data["preferred_section_uuid"]
+        return super().save(commit)
 
     @cached_property
     def sections_participant_qualifies_for(self):
@@ -161,41 +198,9 @@ def sections_participant_qualifies_for(self):
             self.method.configuration.sections, self.participant
         )
 
-    def get_form(self, form_class=None):
-        form = SectionSignupForm(self.request.POST)
-        form.fields["section"].choices = [
-            (section["uuid"], section["title"])
-            for section in self.sections_participant_qualifies_for
-        ]
-        return form
-
-    def get_context_data(self, **kwargs):
-        kwargs.setdefault("shift", self.shift)
-        kwargs.setdefault(
-            "unqualified_sections",
-            [
-                section["title"]
-                for section in self.method.configuration.sections
-                if section not in self.sections_participant_qualifies_for
-            ],
-        )
-        return super().get_context_data(**kwargs)
 
-    def form_valid(self, form):
-        return super().signup_pressed(preferred_section_uuid=form.cleaned_data.get("section"))
-
-    def signup_pressed(self, **kwargs):
-        if not self.method.configuration.choose_preferred_section:
-            # do straight signup if choosing is not enabled
-            return super().signup_pressed(**kwargs)
-
-        if not self.method.can_sign_up(self.participant):
-            # redirect a misled request
-            messages.warning(self.request, _("You can not sign up for this shift."))
-            return redirect(self.participant.reverse_event_detail(self.shift.event))
-
-        # all good, redirect to the form
-        return redirect(self.participant.reverse_signup_action(self.shift))
+class SectionBasedSignupView(BaseSignupView):
+    form_class = SectionSignupForm
 
 
 class SectionBasedSignupMethod(BaseSignupMethod):
@@ -208,33 +213,11 @@ class SectionBasedSignupMethod(BaseSignupMethod):
     registration_button_text = _("Request")
     signup_success_message = _("You have successfully requested a participation for {shift}.")
     signup_error_message = _("Requesting a participation failed: {error}")
-
-    configuration_form_class = SectionBasedConfigurationForm
     signup_view_class = SectionBasedSignupView
-
     disposition_participation_form_class = SectionBasedDispositionParticipationForm
 
-    def get_configuration_fields(self):
-        return {
-            **super().get_configuration_fields(),
-            "choose_preferred_section": {
-                "formfield": forms.BooleanField(
-                    label=_("Ask participants for a preferred section"),
-                    help_text=_("This only makes sense if you configure multiple sections."),
-                    widget=forms.CheckboxInput,
-                    required=False,
-                ),
-                "default": False,
-            },
-            "sections": {
-                "formfield": forms.Field(
-                    label=_("Structure"),
-                    widget=forms.HiddenInput,
-                    required=False,
-                ),
-                "default": [],
-            },
-        }
+    configuration_form_class = SectionBasedConfigurationForm
+    shift_state_template_name = "basesignup/section_based/fragment_state.html"
 
     def _get_signup_stats_per_section(self, participations=None):
         from ephios.core.signup.methods import SignupStats
@@ -299,7 +282,7 @@ def get_signup_stats(self):
     @staticmethod
     def check_qualification(method, participant):
         if not sections_participant_qualifies_for(method.configuration.sections, participant):
-            return ParticipationError(_("You are not qualified."))
+            return ParticipantUnfitError(_("You are not qualified."))
 
     @property
     def _signup_checkers(self):
@@ -307,31 +290,22 @@ def _signup_checkers(self):
 
     # pylint: disable=arguments-differ
     def _configure_participation(
-        self, participation: AbstractParticipation, preferred_section_uuid=None, **kwargs
+        self, participation: AbstractParticipation, **kwargs
     ) -> AbstractParticipation:
-        participation.data["preferred_section_uuid"] = preferred_section_uuid
-        if preferred_section_uuid:
-            # reset dispatch decision, as that would have overwritten the preferred choice
-            participation.data["dispatched_section_uuid"] = None
         participation.state = AbstractParticipation.States.REQUESTED
         return participation
 
     def render_configuration_form(self, *args, form=None, **kwargs):
+        """We overwrite the template to render the formset."""
         form = form or self.get_configuration_form(*args, **kwargs)
         template = get_template("basesignup/section_based/configuration_form.html").render(
             {"form": form}
         )
         return template
 
-    def render_shift_state(self, request):
-
-        participations = self.shift.participations.filter(
-            state__in={
-                AbstractParticipation.States.REQUESTED,
-                AbstractParticipation.States.CONFIRMED,
-            }
-        ).order_by("-state")
-
+    def get_shift_state_context_data(self, request, **kwargs):
+        context_data = super().get_shift_state_context_data(request)
+        participations = context_data["participations"]
         section_stats = self._get_signup_stats_per_section(participations)
         sections = {
             section["uuid"]: {
@@ -367,20 +341,8 @@ def render_shift_state(self, request):
                 "placeholder": [],
             }
 
-        return get_template("basesignup/section_based/fragment_state.html").render(
-            {
-                "shift": self.shift,
-                "sections": sections,
-                "disposition_url": (
-                    reverse(
-                        "core:shift_disposition",
-                        kwargs=dict(pk=self.shift.pk),
-                    )
-                    if request.user.has_perm("core.change_event", obj=self.shift.event)
-                    else None
-                ),
-            }
-        )
+        context_data["sections"] = sections
+        return context_data
 
     def _get_sections_with_users(self):
         relevant_qualification_categories = global_preferences_registry.manager()[
diff --git a/ephios/plugins/basesignup/templates/basesignup/fragment_state_common.html b/ephios/plugins/basesignup/templates/basesignup/fragment_participation_pills_shift_state.html
similarity index 100%
rename from ephios/plugins/basesignup/templates/basesignup/fragment_state_common.html
rename to ephios/plugins/basesignup/templates/basesignup/fragment_participation_pills_shift_state.html
diff --git a/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html b/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
index 1224ddf51..8ab2ebeb0 100644
--- a/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
+++ b/ephios/plugins/basesignup/templates/basesignup/participation_card_inline.html
@@ -1,3 +1,4 @@
+{% load guardian_tags %}
 {% load user_extras %}
 {% load i18n %}
 
@@ -7,11 +8,27 @@
 </div>
 
 <div id="popover-content-{{ participation.id }}" class="d-none">
-    {% for qualification in participation.participant.qualifications|get_relevant_qualifications %}
-        <span class='badge bg-secondary text-dark'>{{ qualification }}</span>
-    {% empty %}
-        <em>{% translate "none" %}</em>
-    {% endfor %}
+    {% if participation.individual_start_time or participation.individual_end_time %}
+        <div class="mb-3">
+            <i class="fas fa-user-clock"></i>
+            <strong>{{ participation.get_time_display }}</strong>
+        </div>
+    {% endif %}
+    {% if participation.comment %}
+        {% if disposition_url or participation == own_participation %}
+            <div class="mb-3">
+                <i class="fas fa-comment"></i>
+                <span>{{ participation.comment }}</span>
+            </div>
+        {% endif %}
+    {% endif %}
+    <div>
+        {% for qualification in participation.participant.qualifications|get_relevant_qualifications %}
+            <span class='badge bg-secondary text-dark'>{{ qualification }}</span>
+        {% empty %}
+            <em>{% translate "none" %}</em>
+        {% endfor %}
+    </div>
 </div>
 
 <a class="badge
@@ -20,13 +37,17 @@
    tabindex="0"
    data-bs-toggle="popover"
    data-bs-trigger="hover"
-   data-title-ref="#popover-title-{{ participation.id }}"
    data-bs-placement="bottom"
    data-html="true"
+   data-title-ref="#popover-title-{{ participation.id }}"
    data-bs-content-ref="#popover-content-{{ participation.id }}"
 >
     {% if participation.state == participation.States.CONFIRMED %}
-        <i class="fas fa-check"></i>
+        {% if participation.has_customized_signup %}
+            <i class="fas fa-cog"></i>
+        {% else %}
+            <i class="fas fa-check"></i>
+        {% endif %}
     {% else %}
         <i class="far fa-clock"></i>
     {% endif %}
diff --git a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participant.html b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participant.html
deleted file mode 100644
index e8340d39d..000000000
--- a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participant.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "core/disposition/base_participation.html" %}
-{% load user_extras %}
-{% load ephios_crispy %}
-{% load i18n %}
-{% block body %}
-    <h6 class="mb-0">
-        <div class="row align-items-center no-gutters">
-            <div class="col-8 d-flex pe-3">
-                <div class="pe-1">
-                    {{ form.instance.participant.icon }}
-                    {{ form.instance.participant }}
-                    {% if form.preferred_section %}
-                        <small class="text-muted">
-                            <br> {% translate "prefers" %}
-                            {{ form.preferred_section.title }}
-                        </small>
-                    {% endif %}
-                </div>
-                <div>
-                    {% with form.instance.participant|conflicting_shifts:shift as conflicting_shifts %}
-                        {% if conflicting_shifts %}
-                            <span class="fa fa-exclamation-triangle text-danger"
-                                  data-bs-toggle="tooltip"
-                                  title="{% blocktranslate trimmed with participant=form.instance.participant conflicts=conflicting_shifts|join:", " %}
-                                      {{ participant }} already participates in {{ conflicts }} at the same time.
-                                  {% endblocktranslate %}"></span>
-                        {% endif %}
-                    {% endwith %}
-                    {% for qualification in form.instance.participant.qualifications|get_relevant_qualifications %}
-                        <span class="badge bg-secondary">{{ qualification }}</span>
-                    {% endfor %}
-                </div>
-            </div>
-            <div class="col-4 d-flex justify-content-between align-items-center">
-                {% crispy_field form.section label_class="d-none" wrapper_class="d-inline-block mb-0" %}
-
-                {% if form.can_delete %}
-                    <button type="button" class="btn float-end btn-sm ms-1" data-formset-delete-button>
-                        <i class="fas fa-times"></i>
-                    </button>
-                {% endif %}
-            </div>
-        </div>
-    </h6>
-{% endblock %}
\ No newline at end of file
diff --git a/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html
new file mode 100644
index 000000000..feb6ba8dd
--- /dev/null
+++ b/ephios/plugins/basesignup/templates/basesignup/section_based/fragment_participation.html
@@ -0,0 +1,19 @@
+{% extends "core/disposition/fragment_participation.html" %}
+{% load ephios_crispy %}
+{% load user_extras %}
+{% load i18n %}
+
+{% block participation_controls %}
+    <div class="mb-n3">
+        {% crispy_field form.section label_class="d-none" wrapper_class="d-inline-block me-3" %}
+    </div>
+{% endblock %}
+
+{% block participation_detail %}
+    {% if form.preferred_section %}
+        <small class="text-muted">
+            <br> {% translate "prefers" %}
+            {{ form.preferred_section.title }}
+        </small>
+    {% endif %}
+{% endblock %}
diff --git a/ephios/plugins/basesignup/templates/basesignup/section_based/signup.html b/ephios/plugins/basesignup/templates/basesignup/section_based/signup.html
deleted file mode 100644
index 77b95c43f..000000000
--- a/ephios/plugins/basesignup/templates/basesignup/section_based/signup.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_filters %}
-{% load i18n %}
-{% load static %}
-
-{% block title %}
-    {% translate "Signup" %}
-{% endblock %}
-
-{% block content %}
-    <div class="page-header">
-        <h1>{{ shift }}</h1>
-    </div>
-
-    <form method="post" class="form">
-        {% csrf_token %}
-        {{ form|crispy }}
-        {% if unqualified_sections %}
-        <p>
-            {% translate "You don't qualify for" %}
-            {{ unqualified_sections|join:", "}}.
-        </p>
-        {% endif %}
-        <button type="submit" class="btn btn-primary w-100">{% translate "Request" %}</button>
-    </form>
-
-{% endblock %}
diff --git a/ephios/plugins/eventautoqualification/migrations/0004_alter_eventautoqualificationconfiguration_expiration_date.py b/ephios/plugins/eventautoqualification/migrations/0004_alter_eventautoqualificationconfiguration_expiration_date.py
new file mode 100644
index 000000000..b45ef148b
--- /dev/null
+++ b/ephios/plugins/eventautoqualification/migrations/0004_alter_eventautoqualificationconfiguration_expiration_date.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.2.7 on 2021-10-03 15:34
+
+from django.db import migrations
+
+import ephios.core.models.users
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("eventautoqualification", "0003_alter_eventautoqualificationconfiguration_id"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="eventautoqualificationconfiguration",
+            name="expiration_date",
+            field=ephios.core.models.users.ExpirationDateField(
+                blank=True, null=True, verbose_name="Expiration date"
+            ),
+        ),
+    ]
diff --git a/ephios/plugins/eventautoqualification/models.py b/ephios/plugins/eventautoqualification/models.py
index 7ba6832a9..d05b8e420 100644
--- a/ephios/plugins/eventautoqualification/models.py
+++ b/ephios/plugins/eventautoqualification/models.py
@@ -1,9 +1,8 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from ephios.core.models import Event
+from ephios.core.models import Event, Qualification
 from ephios.core.models.users import ExpirationDateField
-from ephios.core.signup import Qualification
 from ephios.modellogging.log import ModelFieldsLogConfig, register_model_for_logging
 
 
diff --git a/ephios/plugins/guests/models.py b/ephios/plugins/guests/models.py
index c3a36b477..f1fb3f530 100644
--- a/ephios/plugins/guests/models.py
+++ b/ephios/plugins/guests/models.py
@@ -7,9 +7,9 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
-from ephios.core.models import AbstractParticipation, Event
+from ephios.core.models import AbstractParticipation, Event, Qualification
 from ephios.core.models.events import PARTICIPATION_LOG_CONFIG
-from ephios.core.signup import AbstractParticipant, Qualification
+from ephios.core.signup.participants import AbstractParticipant
 from ephios.modellogging.log import register_model_for_logging
 
 
diff --git a/ephios/static/ephios/js/main.js b/ephios/static/ephios/js/main.js
index 0d17537ef..30792b107 100644
--- a/ephios/static/ephios/js/main.js
+++ b/ephios/static/ephios/js/main.js
@@ -8,7 +8,8 @@ function handleForms(elem) {
         new bootstrap.Popover(el, {
             html: true,
             content: function () {
-                return $(el.getAttribute("data-bs-content-ref")).html();
+                const query = el.getAttribute("data-bs-content-ref");
+                return $(query).html();
             },
             title: function () {
                 return $(el.getAttribute("data-title-ref")).html();
diff --git a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
index a97fd5ebb..24904a893 100644
--- a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
+++ b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss
@@ -54,6 +54,8 @@ $card-cap-bg: $gray-100;
 
 $text-muted: $gray-550;
 
+$enable-negative-margins: true;
 
 // Shadow (navbar)
 $box-shadow: 0 4px 4px rgba(#000, .10);
+
diff --git a/ephios/static/ephios/scss/ephios_custom.scss b/ephios/static/ephios/scss/ephios_custom.scss
index 98288913e..76086ec37 100644
--- a/ephios/static/ephios/scss/ephios_custom.scss
+++ b/ephios/static/ephios/scss/ephios_custom.scss
@@ -205,5 +205,10 @@ This hack fixes that. Inspired by https://github.com/select2/select2/issues/4220
 
 // disable link badges underlining
 a.badge {
-    text-decoration: none;
+  text-decoration: none;
+}
+
+// show form feedback
+.invalid-feedback {
+  display: block;
 }
diff --git a/ephios/static/plugins/basesignup/js/disposition.js b/ephios/static/plugins/basesignup/js/disposition.js
index a12f8df4e..123641f8a 100644
--- a/ephios/static/plugins/basesignup/js/disposition.js
+++ b/ephios/static/plugins/basesignup/js/disposition.js
@@ -69,6 +69,8 @@ $(document).ready(function () {
             },
             sort: true,
             draggable: ".draggable",
+            filter: ".do-not-drag",
+            preventOnFilter: false,
             emptyInsertThreshold: 20,
             fallbackTolerance: 5,
             animation: 150,
diff --git a/tests/conftest.py b/tests/conftest.py
index e2b934841..8ba1bbfac 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -94,7 +94,14 @@ def volunteer():
 
 
 @pytest.fixture
-def qualified_volunteer(volunteer, qualifications, tz):
+def qualified_volunteer(qualifications, tz):
+    volunteer = UserProfile.objects.create(
+        first_name="Marianne",
+        last_name="Medizinfrau",
+        email="marianne@localhost",
+        date_of_birth=date(1985, 1, 1),
+        password="dummy",
+    )
     QualificationGrant.objects.create(
         user=volunteer,
         qualification=qualifications.nfs,
@@ -120,11 +127,11 @@ def responsible_user():
 
 @pytest.fixture
 def service_event_type():
-    return EventType.objects.create(title="Service", can_grant_qualification=False)
+    return EventType.objects.create(title="Service")
 
 
 @pytest.fixture
-def groups(superuser, manager, planner, volunteer):
+def groups(superuser, manager, planner, volunteer, qualified_volunteer):
     managers = Group.objects.create(name="Managers")
     planners = Group.objects.create(name="Planners")
     volunteers = Group.objects.create(name="Volunteers")
@@ -132,7 +139,7 @@ def groups(superuser, manager, planner, volunteer):
     managers.user_set.add(superuser)
     managers.user_set.add(manager)
     planners.user_set.add(superuser, planner)
-    volunteers.user_set.add(superuser, planner, volunteer)
+    volunteers.user_set.add(superuser, planner, volunteer, qualified_volunteer)
 
     assign_perm("publish_event_for_group", planners, volunteers)
     assign_perm("core.add_event", planners)
@@ -175,7 +182,7 @@ def event(groups, service_event_type, planner, tz):
         start_time=datetime(2099, 6, 30, 8, 0).astimezone(tz),
         end_time=datetime(2099, 6, 30, 20, 30).astimezone(tz),
         signup_method_slug=RequestConfirmSignupMethod.slug,
-        signup_configuration={},
+        signup_configuration=dict(user_can_decline_confirmed=True),
     )
     return event
 
@@ -204,7 +211,7 @@ def conflicting_event(event, service_event_type, volunteer, groups):
     )
 
     LocalParticipation.objects.create(
-        shift=event.shifts.first(),
+        shift=conflicting_event.shifts.first(),
         user=volunteer,
         state=AbstractParticipation.States.CONFIRMED,
     )
diff --git a/tests/core/test_consequences.py b/tests/core/test_consequences.py
index 1ee2e6088..479e7c8fb 100644
--- a/tests/core/test_consequences.py
+++ b/tests/core/test_consequences.py
@@ -54,6 +54,8 @@ def test_confirm_qualification_granting(
     def test_extend_qualification(
         self, django_app, qualified_volunteer, qualifications_consequence, qualifications
     ):
+        qualifications_consequence.user = qualified_volunteer
+        qualifications_consequence.save()
         with pytest.raises(Qualification.DoesNotExist):
             qualified_volunteer.qualifications.get(
                 pk=qualifications.nfs.pk, expires=qualifications_consequence.data.get("expires")
diff --git a/tests/core/test_event_form.py b/tests/core/test_event_form.py
index 3ca1735b8..9e7c26b92 100644
--- a/tests/core/test_event_form.py
+++ b/tests/core/test_event_form.py
@@ -3,7 +3,7 @@
 from django.urls import reverse
 from guardian.shortcuts import get_users_with_perms
 
-from ephios.core.signup import AbstractParticipation, LocalParticipation
+from ephios.core.models import AbstractParticipation, LocalParticipation
 from ephios.extra.permissions import get_groups_with_perms
 
 
diff --git a/tests/core/test_ical.py b/tests/core/test_ical.py
index 89cbf2e3a..cfa15e1ba 100644
--- a/tests/core/test_ical.py
+++ b/tests/core/test_ical.py
@@ -1,4 +1,7 @@
+from datetime import timedelta
+
 from django.urls import reverse
+from django.utils.datetime_safe import strftime
 
 from ephios.core.models import AbstractParticipation
 
@@ -18,6 +21,8 @@ def test_user_event_feed(django_app, qualified_volunteer, event):
     # only after getting confirmed the feed should contain the event
     participation = AbstractParticipation.objects.last()
     participation.state = AbstractParticipation.States.CONFIRMED
+    individual_start_time = event.shifts.first().start_time + timedelta(minutes=53)
+    participation.individual_start_time = individual_start_time
     participation.save()
     response = django_app.get(
         reverse(
@@ -25,3 +30,4 @@ def test_user_event_feed(django_app, qualified_volunteer, event):
         )
     )
     assert response and event.title in response
+    assert strftime(individual_start_time, "%M") in response
diff --git a/tests/core/test_notifications.py b/tests/core/test_notifications.py
index a1061aef5..d390de1ff 100644
--- a/tests/core/test_notifications.py
+++ b/tests/core/test_notifications.py
@@ -13,9 +13,11 @@
     NewEventNotification,
     NewProfileNotification,
     ParticipationConfirmedNotification,
+    ParticipationCustomizationNotification,
     ParticipationRejectedNotification,
     ProfileUpdateNotification,
-    ResponsibleParticipationRequested,
+    ResponsibleConfirmedParticipationCustomizedNotification,
+    ResponsibleParticipationRequestedNotification,
     enabled_notification_types,
 )
 
@@ -73,7 +75,7 @@ def test_participation_notification_sending(self, event, qualified_volunteer):
         )
         ParticipationConfirmedNotification.send(participation)
         ParticipationRejectedNotification.send(participation)
-        ResponsibleParticipationRequested.send(participation)
+        ResponsibleParticipationRequestedNotification(participation).send()
         CustomEventParticipantNotification.send(event, "hi")
         assert Notification.objects.count() == 3 + len(
             get_users_with_perms(event, only_with_perms_in=["change_event"])
@@ -81,6 +83,62 @@ def test_participation_notification_sending(self, event, qualified_volunteer):
         call_command("send_notifications")
         assert Notification.objects.count() == 0
 
+    def test_responsible_confirmed_participation_customized_notification(
+        self, django_app, event, planner, qualified_volunteer
+    ):
+        self._enable_all_notifications(planner)
+        participation = LocalParticipation.objects.create(
+            shift=event.shifts.first(),
+            user=qualified_volunteer,
+            state=AbstractParticipation.States.CONFIRMED,
+        )
+        # change individual start time
+        form = django_app.get(
+            reverse("core:signup_action", kwargs=dict(pk=participation.shift.pk)),
+            user=qualified_volunteer,
+        ).form
+        form["individual_start_time_1"] = "07:42"
+        form.submit(name="signup_choice", value="customize").follow()
+
+        # assert only notification of the correct type exist
+        assert set(Notification.objects.all().values_list("slug", flat=True)) == {
+            ResponsibleConfirmedParticipationCustomizedNotification.slug
+        }
+        plaintext = ResponsibleConfirmedParticipationCustomizedNotification.as_plaintext(
+            Notification.objects.first()
+        )
+        assert "7:42" in plaintext
+        call_command("send_notifications")
+        assert Notification.objects.count() == 0
+
+    def test_participant_participation_customized_notification(
+        self, django_app, event, planner, qualified_volunteer
+    ):
+        self._enable_all_notifications(qualified_volunteer)
+        participation = LocalParticipation.objects.create(
+            shift=event.shifts.first(),
+            user=qualified_volunteer,
+            state=AbstractParticipation.States.CONFIRMED,
+        )
+        # change individual start time
+        response = django_app.get(
+            reverse("core:shift_disposition", kwargs=dict(pk=participation.shift.pk)),
+            user=planner,
+        )
+        form = response.forms["participations-form"]
+        form["participations-0-individual_start_time_1"] = "07:42"
+        form.submit()
+
+        # assert only notification of the correct type exist
+        assert Notification.objects.get().slug == ParticipationCustomizationNotification.slug
+
+        plaintext = ParticipationCustomizationNotification.as_plaintext(
+            Notification.objects.first()
+        )
+        assert "7:42" in plaintext
+        call_command("send_notifications")
+        assert Notification.objects.count() == 0
+
     def test_inactive_user(self, volunteer):
         self._enable_all_notifications(volunteer)
         volunteer.is_active = False
diff --git a/tests/core/test_signup_methods.py b/tests/core/test_signup_methods.py
index 8e18b1fe8..7ab01f82a 100644
--- a/tests/core/test_signup_methods.py
+++ b/tests/core/test_signup_methods.py
@@ -2,10 +2,11 @@
 from datetime import datetime, timedelta
 
 import pytest
+from django.utils import timezone
 from django.utils.timezone import make_aware
 
-from ephios.core.models import AbstractParticipation, Shift
-from ephios.core.signup import LocalParticipation, SignupStats, get_conflicting_participations
+from ephios.core.models import AbstractParticipation, LocalParticipation, Shift
+from ephios.core.signup.methods import SignupStats, get_conflicting_participations
 from ephios.plugins.basesignup.signup.instant import InstantConfirmationSignupMethod
 
 
@@ -17,48 +18,99 @@ def test_signup_stats_addition(django_app):
     assert b + c == SignupStats(8, 4, 3, 7, 5, 11)
 
 
+def test_participant_unfit_is_not_the_same_as_signup_errors(event, qualified_volunteer):
+    shift: Shift = event.shifts.first()
+    shift.signup_configuration["signup_until"] = timezone.make_aware(
+        datetime.min.replace(year=2020)
+    )
+    shift.save()
+    assert not shift.signup_method.get_participant_errors(qualified_volunteer.as_participant())
+    assert shift.signup_method.get_signup_errors(qualified_volunteer.as_participant())
+
+
 def test_cannot_sign_up_for_conflicting_shifts(django_app, volunteer, event, conflicting_event):
     assert not conflicting_event.shifts.first().signup_method.can_sign_up(
         volunteer.as_participant()
     )
 
 
+def test_partially_conflicting_shift_results_in_invalid_signup_form(
+    django_app, volunteer, event, conflicting_event
+):
+    assert "already confirmed" in django_app.get(
+        event.get_absolute_url(),
+        user=volunteer,
+    )
+    # make the conflicting shift not cover the shift we want to participate in
+    shift_b = conflicting_event.shifts.first()
+    shift_b.end_time -= timedelta(hours=1)
+    shift_b.save()
+    response = django_app.get(
+        event.get_absolute_url(),
+        user=volunteer,
+    ).form.submit(name="signup_choice", value="sign_up")
+    assert "You are already confirmed for other shifts at this time" in response
+    response.form["individual_start_time_1"] = "18:42"
+    assert (
+        "successfully requested a participation"
+        in response.form.submit(name="signup_choice", value="sign_up").follow()
+    )
+
+
 @pytest.mark.parametrize(
-    "a_times,b_times,conflict_expected",
+    "a_times,b_times,conflict_expected,total",
     [
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 6), datetime(2099, 1, 1, 8)),
             False,
+            False,
         ),
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 6), datetime(2099, 1, 1, 10)),
             True,
+            False,
         ),
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 6), datetime(2099, 1, 1, 12)),
             True,
+            False,
         ),
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 10), datetime(2099, 1, 1, 18)),
             True,
+            False,
         ),
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 11, 59), datetime(2099, 1, 1, 12)),
             True,
+            False,
         ),
         (
             (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
             (datetime(2099, 1, 1, 12), datetime(2099, 1, 1, 18)),
             False,
+            False,
+        ),
+        (
+            (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
+            (datetime(2099, 1, 1, 11), datetime(2099, 1, 1, 14)),
+            False,
+            True,
+        ),
+        (
+            (datetime(2099, 1, 1, 8), datetime(2099, 1, 1, 12)),
+            (datetime(2099, 1, 1, 10), datetime(2099, 1, 1, 11)),
+            True,
+            True,
         ),
     ],
 )
-def test_get_conflicting_shifts(tz, a_times, b_times, conflict_expected, event, volunteer):
+def test_get_conflicting_shifts(tz, a_times, b_times, conflict_expected, total, event, volunteer):
     common = dict(signup_method_slug=InstantConfirmationSignupMethod.slug, event=event)
     aware = functools.partial(make_aware, timezone=tz)
     a = Shift.objects.create(
@@ -77,4 +129,27 @@ def test_get_conflicting_shifts(tz, a_times, b_times, conflict_expected, event,
         shift=a, user=volunteer, state=AbstractParticipation.States.CONFIRMED
     )
     expected = {a_participation} if conflict_expected else set()
-    assert set(get_conflicting_participations(b, volunteer.as_participant())) == expected
+    assert (
+        set(
+            get_conflicting_participations(
+                participant=volunteer.as_participant(),
+                shift=b,
+                total=total,
+            )
+        )
+        == expected
+    )
+
+
+def test_get_conflicting_shift_with_individual_time(tz, volunteer, multi_shift_event):
+    shift_a, shift_b = multi_shift_event.shifts.order_by("start_time")
+    a_participation = LocalParticipation.objects.create(
+        shift=shift_a,
+        user=volunteer,
+        state=AbstractParticipation.States.CONFIRMED,
+        individual_start_time=shift_a.start_time,
+        individual_end_time=shift_b.start_time + timedelta(minutes=30),
+    )
+    assert set(get_conflicting_participations(volunteer.as_participant(), shift_b)) == {
+        a_participation
+    }
diff --git a/tests/plugins/basesignup/test_common.py b/tests/plugins/basesignup/test_common.py
new file mode 100644
index 000000000..c654e73ee
--- /dev/null
+++ b/tests/plugins/basesignup/test_common.py
@@ -0,0 +1,75 @@
+from django.urls import reverse
+
+from ephios.core.models import AbstractParticipation, LocalParticipation
+
+
+def test_getting_dispatched_state_is_overwritten_by_participant_signup(
+    django_app, volunteer, planner, event
+):
+    shift = event.shifts.first()
+
+    # create participation in getting-dispatched state
+    participation = shift.signup_method.get_participation_for(volunteer.as_participant())
+    participation.state = AbstractParticipation.States.GETTING_DISPATCHED
+    participation.save()
+
+    # load to have the form in getting dispatched state
+    response = django_app.get(
+        reverse("core:shift_disposition", kwargs=dict(pk=shift.pk)),
+        user=planner,
+    )
+
+    # meanwhile, request a participation as volunteer
+    participation.state = AbstractParticipation.States.REQUESTED
+    participation.save()
+
+    # save the disposition, and assert that it doesn't overwrite the requested state
+    response.forms["participations-form"].submit()
+    assert (
+        LocalParticipation.objects.get(user=volunteer, shift=shift).state
+        == AbstractParticipation.States.REQUESTED
+    )
+
+
+def test_disposition_delete_participations_getting_dispatched(
+    django_app, volunteer, planner, event
+):
+    # setup a participation
+    shift = event.shifts.first()
+
+    volunteer_participation = shift.signup_method.get_participation_for(volunteer.as_participant())
+    volunteer_participation.state = AbstractParticipation.States.REQUESTED
+    volunteer_participation.save()
+
+    planner_participation = shift.signup_method.get_participation_for(planner.as_participant())
+    planner_participation.state = AbstractParticipation.States.GETTING_DISPATCHED
+    planner_participation.save()
+
+    # delete the getting dispatched participation
+    response = django_app.get(
+        reverse("core:shift_disposition", kwargs=dict(pk=shift.pk)),
+        user=planner,
+    )
+    form = response.forms["participations-form"]
+    form["participations-0-state"] = AbstractParticipation.States.RESPONSIBLE_REJECTED.value
+    form["participations-1-DELETE"] = True
+    form.submit()
+
+    assert (
+        LocalParticipation.objects.get().state == AbstractParticipation.States.RESPONSIBLE_REJECTED
+    )
+
+
+def test_comment_is_only_visible_to_responsibles(
+    django_app, planner, volunteer, qualified_volunteer, event
+):
+    # comment is also not visible for
+    COMMENT_TEXT = "n.f.D. super secret comment text"
+    response = django_app.get(event.get_absolute_url(), user=volunteer)
+    form = response.form.submit(name="signup_choice", value="customize").form
+    form["comment"] = COMMENT_TEXT
+    response = form.submit(name="signup_choice", value="sign_up").follow()
+
+    assert COMMENT_TEXT in response
+    assert COMMENT_TEXT in django_app.get(event.get_absolute_url(), user=planner)
+    assert COMMENT_TEXT not in django_app.get(event.get_absolute_url(), user=qualified_volunteer)
diff --git a/tests/plugins/basesignup/test_no_selfservice.py b/tests/plugins/basesignup/test_no_selfservice.py
index 1595fd4ee..85509eb3e 100644
--- a/tests/plugins/basesignup/test_no_selfservice.py
+++ b/tests/plugins/basesignup/test_no_selfservice.py
@@ -17,5 +17,11 @@ def test_no_selfservice_renders(django_app, volunteer, event, no_selfservice_shi
 
 
 def test_no_selfservice_does_not_allow_signup(django_app, volunteer, event, no_selfservice_shift):
-    response = django_app.get(event.get_absolute_url(), user=volunteer)
-    response.form.submit(name="signup_choice", value="sign_up", status=405)  # method not allowed
+    event_detail = django_app.get(event.get_absolute_url(), user=volunteer)
+    # django webtest would ignore a `signup_choice` on the event_detail view, so we just get the default sign up view
+    signup_view = event_detail.form.submit()
+    # from there though, signup will not be possible
+    assert (
+        "This action is not allowed"
+        in signup_view.form.submit(name="signup_choice", value="sign_up").follow()
+    )
diff --git a/tests/plugins/basesignup/test_requestconfirm_signup.py b/tests/plugins/basesignup/test_requestconfirm_signup.py
index c83656b3f..462caff5e 100644
--- a/tests/plugins/basesignup/test_requestconfirm_signup.py
+++ b/tests/plugins/basesignup/test_requestconfirm_signup.py
@@ -16,7 +16,7 @@ def test_request_confirm_signup_flow(django_app, volunteer, planner, event):
     )
 
     response = django_app.get(event.get_absolute_url(), user=volunteer)
-    assert "already requested" in response
+    assert "mannequin_requested" in response
 
     # confirm the participation as planner
     response = django_app.get(
@@ -66,60 +66,3 @@ def test_request_confirm_add_user_in_disposition(django_app, volunteer, planner,
     )
     assert volunteer.first_name in response
     assert volunteer.as_participant().participation_for(shift) is not None
-
-
-def test_getting_dispatched_state_is_overwritten_by_participant_signup(
-    django_app, volunteer, planner, event
-):
-    shift = event.shifts.first()
-
-    # create participation in getting-dispatched state
-    participation = shift.signup_method.get_participation_for(volunteer.as_participant())
-    participation.state = AbstractParticipation.States.GETTING_DISPATCHED
-    participation.save()
-
-    # load to have the form in getting dispatched state
-    response = django_app.get(
-        reverse("core:shift_disposition", kwargs=dict(pk=shift.pk)),
-        user=planner,
-    )
-
-    # meanwhile, request a participation as volunteer
-    participation.state = AbstractParticipation.States.REQUESTED
-    participation.save()
-
-    # save the disposition, and assert that it doesn't overwrite the requested state
-    response.forms["participations-form"].submit()
-    assert (
-        LocalParticipation.objects.get(user=volunteer, shift=shift).state
-        == AbstractParticipation.States.REQUESTED
-    )
-
-
-def test_disposition_delete_participations_getting_dispatched(
-    django_app, volunteer, planner, event
-):
-    # setup a participation
-    shift = event.shifts.first()
-
-    volunteer_participation = shift.signup_method.get_participation_for(volunteer.as_participant())
-    volunteer_participation.state = AbstractParticipation.States.REQUESTED
-    volunteer_participation.save()
-
-    planner_participation = shift.signup_method.get_participation_for(planner.as_participant())
-    planner_participation.state = AbstractParticipation.States.GETTING_DISPATCHED
-    planner_participation.save()
-
-    # delete the getting dispatched participation
-    response = django_app.get(
-        reverse("core:shift_disposition", kwargs=dict(pk=shift.pk)),
-        user=planner,
-    )
-    form = response.forms["participations-form"]
-    form["participations-0-state"] = AbstractParticipation.States.RESPONSIBLE_REJECTED.value
-    form["participations-1-DELETE"] = True
-    form.submit()
-
-    assert (
-        LocalParticipation.objects.get().state == AbstractParticipation.States.RESPONSIBLE_REJECTED
-    )
diff --git a/tests/plugins/basesignup/test_sectionbased_signup.py b/tests/plugins/basesignup/test_sectionbased_signup.py
index 8860085a8..e3d893c65 100644
--- a/tests/plugins/basesignup/test_sectionbased_signup.py
+++ b/tests/plugins/basesignup/test_sectionbased_signup.py
@@ -94,25 +94,13 @@ def test_signup_flow(django_app, qualified_volunteer, planner, event, sectioned_
         )
         .forms[1]
         .submit(name="signup_choice", value="sign_up")
-        .follow()
     )
-    response.form["section"] = KTW_UUID
-    response.form.submit()
+    response.form["preferred_section_uuid"] = KTW_UUID
+    response.form.submit(name="signup_choice", value="sign_up").follow()
     assert (
         LocalParticipation.objects.get(user=qualified_volunteer, shift=sectioned_shift).state
         == AbstractParticipation.States.REQUESTED
     )
-    # test we can't signup again
-    assert (
-        "You have already requested a participation."
-        in django_app.get(
-            event.get_absolute_url(),
-            user=qualified_volunteer,
-        )
-        .forms[1]
-        .submit(name="signup_choice", value="sign_up")
-        .follow()
-    )
 
     # confirm the participation as planner
     response = django_app.get(