diff --git a/compose.yaml b/compose.yaml
new file mode 100644
index 0000000..32af6a1
--- /dev/null
+++ b/compose.yaml
@@ -0,0 +1,16 @@
+version: '3.8'
+services:
+  db:
+    image: postgres:16.1-alpine3.19
+    restart: always
+    environment:
+      POSTGRES_HOST_AUTH_METHOD: trust
+#      POSTGRES_USER: postgres
+#      POSTGRES_PASSWORD: postgres
+#      POSTGRES_DB: postgres
+    ports:
+      - "5900:5432"
+  redis:
+    image: redis:alpine3.17
+    ports:
+      - "6379:6379"
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index bb00d3e..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3.8"
-services:
-  db:
-    image: postgres:15-alpine
-    environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
-    ports:
-      - "5432:5432"
-  redis:
-    image: redis:alpine3.17
-    ports:
-      - "6379:6379"
diff --git a/gary/settings.py b/gary/settings.py
index bfc8f78..bdc121f 100644
--- a/gary/settings.py
+++ b/gary/settings.py
@@ -173,6 +173,7 @@ def get_envvar_list(envvar_name, default=[], separator=",", normalize=True):
 
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_AUTHENTICATION_METHOD = 'email'
+ACCOUNT_USER_DISPLAY = "gifter.utils.user_display"
 
 AUTHENTICATION_BACKENDS = [
     "django.contrib.auth.backends.ModelBackend",
diff --git a/gifter/migrations/0006_wishlist_groups.py b/gifter/migrations/0006_wishlist_groups.py
new file mode 100644
index 0000000..cbcde29
--- /dev/null
+++ b/gifter/migrations/0006_wishlist_groups.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.1.2 on 2023-12-17 02:04
+
+from django.db import migrations, models
+
+
+def forwards_func(apps, schema_editor):
+    Wishlist = apps.get_model("gifter", "Wishlist")
+    for wishlist in Wishlist.objects.all():
+        wishlist.groups.add(wishlist.group)
+        wishlist.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("gifter", "0005_alter_claim_options_alter_groupinvitation_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="wishlist",
+            name="groups",
+            field=models.ManyToManyField(related_name="wishlists", to="auth.group"),
+        ),
+        migrations.RunPython(
+            code=forwards_func,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]
diff --git a/gifter/migrations/0007_remove_wishlist_group.py b/gifter/migrations/0007_remove_wishlist_group.py
new file mode 100644
index 0000000..6881be7
--- /dev/null
+++ b/gifter/migrations/0007_remove_wishlist_group.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.1.2 on 2023-12-17 02:29
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("gifter", "0006_wishlist_groups"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="wishlist",
+            name="group",
+        ),
+    ]
diff --git a/gifter/models.py b/gifter/models.py
index 18957d8..8d33f3c 100644
--- a/gifter/models.py
+++ b/gifter/models.py
@@ -87,10 +87,10 @@ def __str__(self):
 class Wishlist(CommonBaseClass):
     title = models.CharField(max_length=120, blank=False, null=False)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    group = models.ForeignKey(Group, on_delete=models.CASCADE)
+    groups = models.ManyToManyField(Group, related_name="wishlists")
 
     def __str__(self):
-        return f"Wishlist for {self.owner} on {self.group.name}"
+        return f"Wishlist for {self.owner} (in {self.groups.count()} groups)"
 
 
 class Item(CommonBaseClass):
diff --git a/gifter/static/css/main.css b/gifter/static/css/main.css
index f727dd8..deb47f3 100644
--- a/gifter/static/css/main.css
+++ b/gifter/static/css/main.css
@@ -30,12 +30,14 @@ a:link, a:visited {
 .profile {
     display: flex;
     align-items: center;
+    justify-content: center;
 }
 
 .profile-photo {
     max-height: 40px;
     max-width: 40px;
     border-radius: 100px;
+    margin-right: 0.5em;
 }
 
 .socialaccount_providers {
diff --git a/gifter/urls.py b/gifter/urls.py
index 75818ea..3d05752 100644
--- a/gifter/urls.py
+++ b/gifter/urls.py
@@ -22,7 +22,7 @@
     GroupDeleteView,
     SendInviteFormView,
     MyWishlistsListView,
-    ItemDeleteView,
+    ItemDeleteView, UpdateWishlistOptionsView, ClaimListView,
 )
 
 urlpatterns = [
@@ -41,6 +41,11 @@
     path(
         "groups/<str:group_pk>/wishlists/<str:pk>",
         WishlistDetailView.as_view(),
+        name="wishlist_detail_with_group",
+    ),
+    path(
+        "wishlists/<str:pk>",
+        WishlistDetailView.as_view(),
         name="wishlist_detail",
     ),
     path(
@@ -49,10 +54,15 @@
         name="wishlist_update",
     ),
     path(
-        "groups/<str:group_pk>/wishlists/<str:pk>/delete",
+        "wishlists/<str:pk>/delete",
         WishlistDeleteView.as_view(),
         name="wishlist_delete",
     ),
+    path(
+        "groups/<int:group_pk>/wishlists/<str:pk>/delete",
+        WishlistDeleteView.as_view(),
+        name="wishlist_delete_with_group",
+    ),
     path("wishlists", MyWishlistsListView.as_view(), name="my_wishlists"),
     path(
         "wishlists/<str:wishlist_pk>/items/create",
@@ -74,6 +84,16 @@
         ClaimCreateView.as_view(),
         name="claim_create",
     ),
+    path(
+        "wishlists/<str:wishlist_pk>/items/<str:item_pk>/claims",
+        ClaimListView.as_view(),
+        name="claim_list",
+    ),
+    path(
+        "groups/<str:group_pk>/wishlists/<str:wishlist_pk>/items/<str:item_pk>/claims",
+        ClaimListView.as_view(),
+        name="claim_list_with_group",
+    ),
     path(
         "wishlists/<str:wishlist_pk>/items/<str:item_pk>/claims/<str:pk>",
         ClaimUpdateView.as_view(),
@@ -84,6 +104,14 @@
         ClaimDeleteView.as_view(),
         name="claim_delete",
     ),
+    path(
+        "wishlists/<str:pk>/add-to-group",
+        UpdateWishlistOptionsView.as_view(),
+        name="add_wishlist_to_group"),
+    path(
+        "wishlists/<str:pk>/remove-from-group",
+        UpdateWishlistOptionsView.as_view(),
+        name="remove_wishlist_from_group"),
     path(
         "invitations/incoming/<str:token>",
         incoming_invitation,
diff --git a/gifter/utils.py b/gifter/utils.py
new file mode 100644
index 0000000..a868696
--- /dev/null
+++ b/gifter/utils.py
@@ -0,0 +1,7 @@
+
+
+def user_display(user):
+    if user.first_name or user.last_name:
+        return f"{user.first_name} {user.last_name}"
+    else:
+        return user.email
diff --git a/gifter/views.py b/gifter/views.py
index 3d9112e..06085da 100644
--- a/gifter/views.py
+++ b/gifter/views.py
@@ -7,7 +7,9 @@
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import Group
 from django.core.exceptions import ValidationError
-from django.http import HttpResponse
+from django.db import transaction
+from django.db.models import Q
+from django.http import HttpResponse, HttpRequest
 from django.shortcuts import redirect
 from django.template.defaultfilters import pluralize
 from django.urls import reverse
@@ -98,6 +100,9 @@ class GroupDetailView(LoginRequiredMixin, DetailView):
     def get_context_data(self, **kwargs):
         context = super(GroupDetailView, self).get_context_data(**kwargs)
         context["send_invite_form"] = InviteParticipantForm(self.request.GET)
+        context["pending_invites"] = GroupInvitation.objects.filter(
+            ~Q(destination_email__in=[self.object.user_set.all().values_list("email", flat=True)]), target_group=self.object, verified_at__isnull=True,
+        )
         return context
 
 
@@ -121,6 +126,10 @@ def get_context_data(self, **kwargs):
         context["my_claims"] = Claim.objects.filter(
             owner=me, item__wishlist=self.object.id
         )
+        context["group_pk"] = self.kwargs.get("group_pk")
+        context["group_name"] = self.object.groups.get(
+            id=context["group_pk"]
+        ) if context["group_pk"] else None
 
         return context
 
@@ -149,15 +158,29 @@ def get_initial(self):
         }
 
     def get_success_url(self):
+        group_pk = self.kwargs.get("group_pk")
+        if group_pk:
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
-            kwargs={"group_pk": str(self.object.group.id), "pk": str(self.object.id)},
+            kwargs={
+                "pk": str(self.object.id),
+            },
         )
 
     def form_valid(self, form):
-        user = self.request.user
-        form.instance.owner = user
-        form.instance.group_id = self.request.resolver_match.kwargs["group_pk"]
+        with transaction.atomic():
+            user = self.request.user
+            form.instance.owner = user
+            form.instance.save()
+            group_pk = self.request.resolver_match.kwargs["group_pk"]
+            form.instance.groups.add(group_pk)
         return super(WishlistCreateView, self).form_valid(form)
 
 
@@ -188,11 +211,17 @@ class WishlistDeleteView(LoginRequiredMixin, DeleteView):
     template_name = "gifter/wishlist_confirm_delete.html"
 
     def get_success_url(self):
+        group_pk = self.kwargs.get("group_pk")
+        if group_pk:
+            return reverse(
+                "group_detail",
+                kwargs={
+                    "pk": group_pk,
+                },
+            )
+
         return reverse(
-            "group_detail",
-            kwargs={
-                "pk": self.object.group.id,
-            },
+            "my_wishlists"
         )
 
 
@@ -207,11 +236,18 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
+        if group_pk := self.kwargs.get("group_pk"):
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": str(self.object.wishlist.id),
-                "group_pk": self.object.wishlist.group_id,
             },
         )
 
@@ -239,11 +275,18 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
+        if group_pk := self.kwargs.get("group_pk"):
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": str(self.object.wishlist.id),
-                "group_pk": self.object.wishlist.group_id,
             },
         )
 
@@ -253,11 +296,18 @@ class ItemDeleteView(LoginRequiredMixin, DeleteView):
     template_name = "gifter/item_confirm_delete.html"
 
     def get_success_url(self):
+        if group_pk := self.kwargs.get("group_pk"):
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": self.object.wishlist.id,
-                "group_pk": self.object.wishlist.group_id,
             },
         )
 
@@ -276,11 +326,19 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
+        group_pk = self.kwargs.get("group_pk")
+        if group_pk:
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.item.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": str(self.object.item.wishlist.id),
-                "group_pk": self.object.item.wishlist.group_id,
             },
         )
 
@@ -308,24 +366,58 @@ def get_context_data(self, **kwargs):
         return context
 
     def get_success_url(self):
+        if group_pk := self.kwargs.get("group_pk"):
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.item.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": str(self.object.item.wishlist.id),
-                "group_pk": self.object.item.wishlist.group_id,
             },
         )
 
 
+class ClaimListView(LoginRequiredMixin, ListView):
+    model = Claim
+    template_name = "gifter/claim_list.html"
+
+    def get_queryset(self):
+        return Claim.objects.filter(item=self.kwargs["item_pk"])
+
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(**kwargs)
+        group_pk = self.kwargs.get("group_pk")
+        context["group_pk"] = group_pk
+        if group_pk:
+            context["group"] = Group.objects.get(
+                id=group_pk
+            ) if group_pk else None
+        context["item"] = Item.objects.get(id=self.kwargs["item_pk"])
+        context["wishlist"] = Wishlist.objects.get(id=self.kwargs["wishlist_pk"])
+        return context
+
+
 class ClaimDeleteView(LoginRequiredMixin, DeleteView):
     model = Claim
 
     def get_success_url(self):
+        if group_pk := self.kwargs.get("group_pk"):
+            return reverse(
+                "wishlist_detail_with_group",
+                kwargs={
+                    "group_pk": group_pk,
+                    "pk": str(self.object.item.wishlist.id),
+                },
+            )
         return reverse(
             "wishlist_detail",
             kwargs={
                 "pk": str(self.object.item.wishlist.id),
-                "group_pk": self.object.item.wishlist.group_id,
             },
         )
 
@@ -436,3 +528,42 @@ def form_valid(self, form):
         )
 
         return super().form_valid(form)
+
+
+class UpdateWishlistOptionsView(LoginRequiredMixin, TemplateView):
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["wishlist"] = Wishlist.objects.get(id=self.kwargs["pk"])
+        return context
+
+    def post(self, request: HttpRequest, *args, **kwargs):
+        wishlist = Wishlist.objects.get(id=self.kwargs["pk"])
+        if request.POST.get("action") == "add_wishlist_to_group":
+            wishlist.groups.add(request.POST.get("group_pk"))
+            messages.add_message(
+                request,
+                level=messages.SUCCESS,
+                message=f"Successfully added wishlist to group",
+                fail_silently=True,
+            )
+        elif request.POST.get("action") == "remove_wishlist_from_group":
+            wishlist.groups.remove(request.POST.get("group_pk"))
+            messages.add_message(
+                request,
+                level=messages.SUCCESS,
+                message=f"Successfully removed wishlist from group",
+                fail_silently=True,
+            )
+
+        if next_url := request.POST.get("next"):
+            return redirect(to=next_url)
+
+        return redirect(
+            to=reverse(
+                "wishlist_detail",
+                kwargs={
+                    "pk": str(wishlist.id),
+                },
+            )
+        )
diff --git a/justfile b/justfile
new file mode 100644
index 0000000..f343a25
--- /dev/null
+++ b/justfile
@@ -0,0 +1,4 @@
+
+db:
+    docker compose down || true
+    docker compose up -d
diff --git a/templates/account/base.html b/templates/account/base.html
index c84c33a..5f2e66a 100644
--- a/templates/account/base.html
+++ b/templates/account/base.html
@@ -48,16 +48,15 @@
 {% block outside_container %}
     <div class="container">
         <div class="row">
-            <div class="col mt-1">
+            <div class="col mt-2">
                 {% bootstrap_messages %}
             </div>
         </div>
     </div>
-<div class="content">
+    <div class="container">
     <div class="row">
-        <div class="col col-md-4 offset-md-4 sm-mx-1">
-            {% block content %}
-            {% endblock %}
+        <div class="col col-md-4 offset-md-4">
+            {% block content %}{% endblock %}
         </div>
     </div>
 </div>
diff --git a/templates/account/email.html b/templates/account/email.html
new file mode 100644
index 0000000..344212a
--- /dev/null
+++ b/templates/account/email.html
@@ -0,0 +1,81 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+
+{% block title %}{% trans "Account - E-mail" %}{% endblock %}
+
+{% block content %}
+    <h1>{% trans "E-mail Addresses" %}</h1>
+    {% if user.emailaddress_set.all %}
+        <div class="card bg-dark">
+            <h5 class="card-header">{% trans 'The following e-mail addresses are associated with your account:' %}</h5>
+            <div class="card-body">
+
+                <form action="{% url 'account_email' %}" class="email_list" method="post">
+                    {% csrf_token %}
+                    <fieldset class="blockLabels">
+
+                        {% for emailaddress in user.emailaddress_set.all %}
+                            <div class="ctrlHolder">
+                                <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
+
+                                    <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
+
+                                    {{ emailaddress.email }}
+                                    {% if emailaddress.verified %}
+                                        <span class="text-primary">{% trans "Verified" %}</span>
+                                    {% else %}
+                                        <span class="text-warning">{% trans "Unverified" %}</span>
+                                    {% endif %}
+                                    {% if emailaddress.primary %}<span class="text-info">{% trans "Primary" %}</span>{% endif %}
+                                </label>
+                            </div>
+                        {% endfor %}
+
+                        <br>
+                        <p>Actions for selected email address:</p>
+                        <div class="btn-group">
+                            <button class="btn btn-primary" type="submit" name="action_primary" >{% trans 'Make Primary' %}</button>
+                            <button class="btn btn-dark" type="submit" name="action_send" onclick="event.target.addAttribute('disabled', 'disabled'); event.preventDefault(); return false;">{% trans 'Re-send Verification' %}</button>
+                            <button class="btn btn-danger" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+                        </div>
+
+                    </fieldset>
+                </form>
+            </div>
+        </div>
+    {% else %}
+        <p><strong>{% trans 'Warning:'%}</strong> {% trans "There aren't any email addresses associated with your account. Please add one to receive updates and important communications." %}</p>
+    {% endif %}
+    <br>
+    <div class="card bg-dark">
+        <h5 class="card-header">{% trans "Add E-mail Address" %}</h5>
+        <div class="card-body">
+
+            <p class="card-text">Want a different email address associated with your account? Add that email here:</p>
+
+            <form method="post" action="{% url 'account_email' %}" class="add_email">
+                {% csrf_token %}
+                {{ form.as_p }}
+                <button name="action_add" type="submit" class="btn btn-primary">{% trans "Add E-mail Address" %}</button>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+
+{% block extra_body %}
+    <script type="text/javascript">
+        (function() {
+            var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+            var actions = document.getElementsByName('action_remove');
+            if (actions.length) {
+                actions[0].addEventListener("click", function(e) {
+                    if (! confirm(message)) {
+                        e.preventDefault();
+                    }
+                });
+            }
+        })();
+    </script>
+{% endblock %}
diff --git a/templates/account/email_confirm.html b/templates/account/email_confirm.html
new file mode 100644
index 0000000..6e5c0b0
--- /dev/null
+++ b/templates/account/email_confirm.html
@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Confirm E-mail Address" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <h5 class="card-header">{% trans "Confirm E-mail Address" %}</h5>
+        <div class="card-body">
+            {% if confirmation %}
+                {% user_display confirmation.email_address.user as user_display %}
+                <p class="card-text">{% blocktrans with email=confirmation.email_address.email full_name=confirmation.email_address.user.get_full_name %}Please confirm that <strong>{{ email }}</strong> is a valid e-mail address for {{ full_name }}.{% endblocktrans %}</p>
+
+                <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
+                    {% csrf_token %}
+                    <button type="submit" class="btn btn-primary">{% trans 'Confirm' %}</button>
+                </form>
+            {% else %}
+                {% url 'account_email' as email_url %}
+                <p class="card-text">{% blocktrans %}This e-mail confirmation link expired or is invalid.{% endblocktrans %}</p>
+                <p class="card-text">{% blocktrans %}Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/templates/account/login.html b/templates/account/login.html
index 750a07f..8d62386 100644
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -13,23 +13,19 @@
                 <h5 class="card-title">{% trans "Sign In" %}</h5>
 
                 {% get_providers as socialaccount_providers %}
-
                 {% if socialaccount_providers %}
-                    <p class="card-text">{% blocktrans with site.name as site_name %}Please sign in with one
-                        of your existing accounts or <a href="{{ signup_url }}">sign up</a>
-                        for an account.{% endblocktrans %}</p>
-
                     <div class="socialaccount_ballot">
                         <ul class="socialaccount_providers">
                             {% include "socialaccount/snippets/provider_list.html" with process="login" %}
                         </ul>
                     </div>
                     {% include "socialaccount/snippets/login_extra.html" %}
-                {% else %}
-                    <p class="card-text">{% blocktrans %}If you have not created an account yet, then please
-                        <a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p>
                 {% endif %}
+            
                 <hr/>
+                {% blocktrans %}
+                <p class="card-text">First time here? <a class="btn btn-sm btn-outline-primary" href="{{ signup_url }}">Sign Up</a></p>
+                {% endblocktrans %}
                 {% csrf_token %}
                 {% bootstrap_form form %}
                 {% if redirect_field_value %}
diff --git a/templates/account/password_change.html b/templates/account/password_change.html
new file mode 100644
index 0000000..326dd9a
--- /dev/null
+++ b/templates/account/password_change.html
@@ -0,0 +1,21 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+            <h5>Change Password</h5>
+            <form method="POST" action="{% url 'account_change_password' %}" class="form-signin password_change">
+                {% csrf_token %}
+                {% bootstrap_form form %}
+                <button type="submit" class="btn btn-primary">Change Password</button>
+            </form>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html
new file mode 100644
index 0000000..d95a363
--- /dev/null
+++ b/templates/account/password_reset.html
@@ -0,0 +1,24 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Password Reset" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+            <h5>Reset your password</h5>
+                <form class="form-signin" method="POST">
+                    {% csrf_token %}
+                    {% bootstrap_form form %}
+                    <button class="btn btn-lg btn-primary btn-block">
+                        Reset My Password
+                    </button>
+                </form>
+                <p class="mt-3">We'll send you an e-mail with instructions to reset your password.</p>
+                <p class="mt-3">If you don't receive an e-mail, please make sure you've entered the address you were registered with, and check your spam folder.</p>
+            </div>
+    </div>
+{% endblock %}
diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html
new file mode 100644
index 0000000..3ba4491
--- /dev/null
+++ b/templates/account/password_reset_done.html
@@ -0,0 +1,28 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Password Reset" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+        <h5>Password Reset Sent</h5>
+            <div class="mt-10 sm:mx-auto sm:w-full sm:max-w-lg">
+                    {% if user.is_authenticated %}
+                        <p class="card-text">
+                            {% include "account/snippets/already_logged_in.html" %}
+                        </p>
+                    {% endif %}
+                    <p>We sent you a password reset e-mail!</p>
+                    <p>
+                        If you don't receive an e-mail, please make sure you've entered the address you were registered
+                        with,
+                        and check your spam folder.
+                    </p>
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html
new file mode 100644
index 0000000..c52d72b
--- /dev/null
+++ b/templates/account/password_reset_from_key.html
@@ -0,0 +1,38 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    {% if token_fail %}
+        <div class="card bg-dark mt-3">
+            <div class="card-body">
+                <h5>Invalid Reset Link</h5>
+                    {% url 'account_reset_password' as passwd_reset_url %}
+                    <p class="card-text">The password reset link was invalid, possibly because it has already been used.
+                        Please request a <a
+                                class="text-primary hover:underline"
+                                href="{{ passwd_reset_url }}">new password reset</a>.</p>
+            </div>
+        </div>
+    {% else %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+        <h5>Change Password</h5>
+                    <form method="post" action="{{ action_url }}" class="form-signin">
+                        {% csrf_token %}
+                        {% if form %}
+                            {% bootstrap_form form %}
+                        {% else %}
+                            <p class="card-text">{% trans 'Your password is now changed.' %}</p>
+                        {% endif %}
+                        <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Change Password" %}</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}
diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html
new file mode 100644
index 0000000..7918394
--- /dev/null
+++ b/templates/account/password_reset_from_key_done.html
@@ -0,0 +1,17 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+            <h5>{% trans "Change Password" %}</h5>
+            <p class="card-text">{% trans 'Your password is now changed.' %}</p>
+            <a class="btn btn-primary" href="{% url "account_login" %}">Sign In</a>
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/account/password_set.html b/templates/account/password_set.html
new file mode 100644
index 0000000..3be0149
--- /dev/null
+++ b/templates/account/password_set.html
@@ -0,0 +1,20 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+
+{% load i18n %}
+{% load account %}
+
+{% block title %}{% trans "Set Password" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <h5 class="card-header">{% trans "Set Password" %}</h5>
+        <div class="card-body">
+            <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
+                {% csrf_token %}
+                {% bootstrap_form form %}
+                <input type="submit" name="action" class="btn btn-primary" value="{% trans 'Set Password' %}"/>
+            </form>
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/account/profile.html b/templates/account/profile.html
index 579bbf1..c5a474c 100644
--- a/templates/account/profile.html
+++ b/templates/account/profile.html
@@ -1,20 +1,19 @@
 {% extends "account/base.html" %}
 {% block head_title %}Profile{% endblock %}
 {% block content %}
-
-    <div class="row">
-    <div class="col col-3">
-        <img style="border-radius: 1000px; height: 4rem; width: 4rem;" src="{{ request.user.display_photo }}" alt="Profile Photo of {{ request.user.display_name }}" />
-    </div>
-    </div>
-    <div class="row">
-        <div class="col col-5">
+    <div class="card bg-dark">
+        <div class="card-header">
+            <h3 class="card-title">Profile</h3>
+        </div>
+        <div class="card-body">
+            <img class="my-2" style="border-radius: 1000px; height: 4rem; width: 4rem;"
+                 src="{{ request.user.display_photo }}" alt="Profile Photo of {{ request.user.display_name }}"/>
             <p>Name: {{ request.user.display_name }}</p>
             {% if request.user.display_email %}
-            <p>Email: {{ request.user.display_email }}</p>
+                <p>Email: {{ request.user.display_email }}</p>
             {% else %}
-            <p>No known email.</p>
+                <p>No known email.</p>
             {% endif %}
         </div>
     </div>
-{% endblock %}»
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/templates/account/signup.html b/templates/account/signup.html
new file mode 100644
index 0000000..9aad05a
--- /dev/null
+++ b/templates/account/signup.html
@@ -0,0 +1,37 @@
+{% extends "account/base.html" %}
+{% load bootstrap5 %}
+{% load i18n %}
+{% load account socialaccount %}
+
+{% block head_title %}{% trans "Signup" %}{% endblock %}
+
+{% block content %}
+    <div class="card bg-dark mt-3">
+        <div class="card-body">
+            <form class="signup form-signin" id="signup_form" method="post" action="{% url 'account_signup' %}">
+                <h5 class="card-title">{% trans "Sign Up" %}</h5>
+
+                {% get_providers as socialaccount_providers %}
+                {% if socialaccount_providers %}
+                    <div class="socialaccount_ballot">
+                        <ul class="socialaccount_providers">
+                            {% include "socialaccount/snippets/provider_list.html" with process="signup" %}
+                        </ul>
+                    </div>
+                    {% include "socialaccount/snippets/login_extra.html" %}
+                {% endif %}
+            
+                <hr/>
+                <p class="card-text">
+                {% blocktrans %}<p class="card-text">Already have an account? <a class="btn btn-sm btn-outline-primary" href="{{ login_url }}">Sign In &raquo;</a></p>{% endblocktrans %}
+                {% csrf_token %}
+                {% bootstrap_form form %}
+                {% if redirect_field_value %}
+                    <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
+                {% endif %}
+                <button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Sign Up" %}</button>
+                <p class="mt-5 mb-3 text-muted">&copy; Gary The Christmas Gift Fairy 2023</p>
+            </form>
+        </div>
+    </div>
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 6f5128b..86d6705 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,7 +9,7 @@
     <title>Gary The Christmas Wishlist Fairy | {% block head_title %}Home{% endblock %}</title>
     {% block styles %}
         <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
-        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.2/font/bootstrap-icons.css">
         <link href="{% static "css/main.css" %}" type="text/css" rel="stylesheet"/>
     {% endblock %}
 </head>
diff --git a/templates/gifter/claim_list.html b/templates/gifter/claim_list.html
new file mode 100644
index 0000000..f88fa62
--- /dev/null
+++ b/templates/gifter/claim_list.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+{% block head_title %}Claims for {{ item.title }}{% endblock %}
+{% block content %}
+    <nav class="mt-3" aria-label="breadcrumb">
+        <ol class="breadcrumb">
+            {% if group_pk %}
+                <li class="breadcrumb-item"><a href="{% url "group_list" %}">Groups</a></li>
+                <li class="breadcrumb-item"><a href="{% url "group_detail" pk=group_pk %}">{{ group.name }}</a>
+                </li>
+            {% endif %}
+            <li class="breadcrumb-item" aria-current="page">
+                <a href="{% url "wishlist_detail" pk=wishlist.pk %}">{{ wishlist.title }}</a>
+            </li>
+            <li class="breadcrumb-item active" aria-current="page">Claims</li>
+        </ol>
+    </nav>
+    <h1>Claims for {{ item.title }}</h1>
+    <p>The following users have claimed this item:</p>
+    {% for claim in claim_list %}
+        <div class="card bg-dark mb-2">
+            <div class="card-header">
+                <p class="text-white">
+                    {{ claim.owner.display_name }}
+                </p>
+            </div>
+            <div class="card-body">
+                {% if claim.description %}
+                {{ claim.description }}
+                {% else %}
+                <em>No description</em>
+                {% endif %}
+            </div>
+        </div>
+    {% endfor %}
+{% endblock %}
diff --git a/templates/gifter/group_detail.html b/templates/gifter/group_detail.html
index 45d359d..0cb6971 100644
--- a/templates/gifter/group_detail.html
+++ b/templates/gifter/group_detail.html
@@ -8,8 +8,6 @@
             <li class="breadcrumb-item active" aria-current="page">{{ group.name }}</li>
         </ol>
     </nav>
-    <div>
-
     <div class="d-flex justify-content-between mt-3">
         <p class="fs-2">{{ group.name }}</p>
         <div>
@@ -21,6 +19,11 @@
     <div class="participant-item" data-bs-toggle="tooltip" data-bs-placement="top" title="{{ participant.display_name }}">
         <img class="participant-icon" src="{{ participant.display_photo }}" alt="{{ user }} Profile Picture" />
     </div>
+    {% endfor %}
+    {% for pending_invite in pending_invites %}
+    <div class="participant-item pending-invite" data-bs-toggle="tooltip" data-bs-placement="top" title="Pending Invitation: {{ pending_invite.destination_email }}" data-email="{{ pending_invite.destination_email }}">
+        <img class="participant-icon" src="https://ui-avatars.com/api/?name={{ pending_invite.destination_email }}" alt="{{ pending_invite.email_address }} Profile Picture" />
+    </div>
     {% endfor %}
         <div class="participant-item participant-add" data-bs-toggle="tooltip" data-bs-placement="top" title="Invite Participant">
         <button class="btn btn-outline-light participant-add-button" data-bs-toggle="modal" data-bs-target="#inviteModal">
@@ -28,10 +31,10 @@
         </button>
         </div>
     </div>
-    {% for wl in group.wishlist_set.all %}
+    {% for wl in group.wishlists.all %}
         <div class="card bg-dark mb-2">
             <div class="card-body">
-                <a href="{% url "wishlist_detail" group_pk=group.pk pk=wl.id %}">{{ wl.title }}</a>
+                <a href="{% url "wishlist_detail_with_group" group_pk=group.pk pk=wl.id %}">{{ wl.title }}</a>
             </div>
         </div>
     {% endfor %}
diff --git a/templates/gifter/item_form.html b/templates/gifter/item_form.html
index bdfe1f1..bf389db 100644
--- a/templates/gifter/item_form.html
+++ b/templates/gifter/item_form.html
@@ -4,7 +4,8 @@
     {% if request.user == wishlist.owner %}
         <h2>Adding to my wishlist</h2>
     {% else %}
-        <h2>Suggesting for {{ wishlist.owner }}'s wishlist <em>"{{ wishlist.title }}"</em></h2>
+        <h2>Adding an item <em>"{{ wishlist.title }}"</em></h2>
+        <p>{{ wishlist.owner }} will not be able to see this item.</p>
     {% endif %}
     {% if object %}
         <form action="{% url "item_update" wishlist_pk=request.resolver_match.kwargs.wishlist_pk pk=object.pk %}" method="post">
diff --git a/templates/gifter/wishlist_detail.html b/templates/gifter/wishlist_detail.html
index 0572d20..d963e03 100644
--- a/templates/gifter/wishlist_detail.html
+++ b/templates/gifter/wishlist_detail.html
@@ -3,15 +3,18 @@
 {% block head_title %}{{ wishlist.group.name }} | Wishlists{% endblock %}
 {% block content %}
     <div class="row">
-    <div class="col">
-        <nav class="mt-3" aria-label="breadcrumb">
-            <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="{% url "group_list" %}">Groups</a></li>
-                <li class="breadcrumb-item"><a href="{% url "group_detail" pk=wishlist.group.id %}">{{ wishlist.group.name }}</a></li>
-                <li class="breadcrumb-item active" aria-current="page">{{ wishlist.title }}</li>
-            </ol>
-        </nav>
-    </div>
+        <div class="col">
+            <nav class="mt-3" aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                    {% if group_pk %}
+                        <li class="breadcrumb-item"><a href="{% url "group_list" %}">Groups</a></li>
+                        <li class="breadcrumb-item"><a href="{% url "group_detail" pk=group_pk %}">{{ group_name }}</a>
+                        </li>
+                    {% endif %}
+                    <li class="breadcrumb-item active" aria-current="page">{{ wishlist.title }}</li>
+                </ol>
+            </nav>
+        </div>
     </div>
     <div class="row">
         <div class="col">
@@ -20,15 +23,22 @@
                     <h2>{{ wishlist.title }}</h2>
                     <div class="btn-group">
                         {% if request.user == wishlist.owner %}
-                        <a href="{% url "wishlist_delete" group_pk=wishlist.group.pk pk=wishlist.pk %}" class="btn btn-outline-danger">Delete</a>
-                        <a href="{% url 'item_create' wishlist_pk=wishlist.pk %}" class="btn btn-success">Add Item &nbsp;<i class="bi bi-plus-square-fill"></i></a>
+                            {% if group_pk %}
+                                <a href="{% url "wishlist_delete_with_group" group_pk=group_pk pk=wishlist.pk %}"
+                                   class="btn btn-outline-danger">Delete</a>
+                            {% else %}
+                                <a href="{% url "wishlist_delete" pk=wishlist.pk %}" class="btn btn-outline-danger">Delete</a>
+                            {% endif %}
+                            <a href="{% url 'item_create' wishlist_pk=wishlist.pk %}" class="btn btn-success">Add Item
+                                &nbsp;<i class="bi bi-plus-square-fill"></i></a>
                         {% else %}
-                        <a href="{% url 'item_create' wishlist_pk=wishlist.pk %}" class="btn btn-outline-success">Suggest Item &nbsp;<i class="bi bi-plus-square-fill"></i></a>
+                            <a href="{% url 'item_create' wishlist_pk=wishlist.pk %}" class="btn btn-outline-success">Add
+                                Item &nbsp;<i class="bi bi-plus-square-fill"></i></a>
                         {% endif %}
                     </div>
                 </div>
                 <div class="card-body">
-                    {% for wli in wishlist.item_set.all %}
+                    {% for wli in wishlist.item_set.all %}{% if wishlist.owner != request.user or wli.owner == request.user %}{# Show if this isn't my list, or, if it is my list, then only show items I added. #}
                         <div class="row mb-2">
                             <div class="col">
                                 <div class="card bg-dark">
@@ -41,29 +51,27 @@ <h2>{{ wishlist.title }}</h2>
                                             {% if my_claims|has_intersection:wli.claim_set.all %}
                                                 {% for claim in my_claims %}
                                                     {% if claim.item == wli %}
-                                                        <a href="{% url "claim_update" wishlist_pk=wishlist.id item_pk=wli.id pk=claim.id %}"
-                                                           class="btn btn-primary position-relative">
-                                                            Update Claim&nbsp;&nbsp;<i class="bi bi-hammer"></i>
-                                                            {% if wli.claim_set.count %}
-                                                                <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-                                                                    {{ wli.claim_set.count }}
-                                                                </span>
-                                                                <span class="visually-hidden">Claims on this item</span>
-                                                            {% endif %}
-                                                        </a>
+                                                        <div class="btn btn-group px-0">
+                                                            <a href="{% url "claim_update" wishlist_pk=wishlist.id item_pk=wli.id pk=claim.id %}"
+                                                               class="btn btn-primary position-relative">
+                                                                Update Claim
+                                                            </a>
+                                                            <a href="{% if group_pk %}{% url "claim_list_with_group" group_pk=group_pk item_pk=wli.pk wishlist_pk=wishlist.pk %}{% else %}{% url "claim_list" item_pk=wli.pk wishlist_pk=wishlist.pk %}{% endif %}" class="btn position-relative {% if wli.claim_set.count > 1 %}btn-warning{% else %}btn-secondary{% endif %}">
+                                                                {{ wli.claim_set.count }}
+                                                            </a>
+                                                        </div>
                                                     {% endif %}
                                                 {% endfor %}
                                             {% else %}
-                                                <a href="{% url "claim_create" wishlist_pk=wishlist.id item_pk=wli.id %}"
-                                                   class="btn btn-primary position-relative">
-                                                    Claim&nbsp;&nbsp;<i class="bi bi-hammer"></i>
-                                                    {% if wli.claim_set.count %}
-                                                        <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-                                                            {{ wli.claim_set.count }}
-                                                        </span>
-                                                        <span class="visually-hidden">Claims on this item</span>
-                                                    {% endif %}
-                                                </a>
+                                                <div class="btn btn-group px-0">
+                                                    <a href="{% url "claim_create" wishlist_pk=wishlist.id item_pk=wli.id %}"
+                                                       class="btn btn-primary position-relative">
+                                                        Claim&nbsp;&nbsp;<i class="bi bi-person-raised-hand"></i>
+                                                    </a>
+                                                    <a href="{% if group_pk %}{% url "claim_list_with_group" group_pk=group_pk item_pk=wli.pk wishlist_pk=wishlist.pk %}{% else %}{% url "claim_list" item_pk=wli.pk wishlist_pk=wishlist.pk %}{% endif %}" class="btn position-relative {% if wli.claim_set.count > 0 %}btn-warning{% else %}btn-secondary{% endif %}">
+                                                        {{ wli.claim_set.count }}
+                                                    </a>
+                                                </div>
                                             {% endif %}
 
                                         {% endif %}
@@ -74,16 +82,70 @@ <h2>{{ wishlist.title }}</h2>
                                             <hr/>
                                             Links:
                                             <ul>
-                                                {% for link in wli.links %}<li><a href="{{ link }}" target="_blank" rel="noopener noreferer">{{ link }}</a></li>{% endfor %}
+                                                {% for link in wli.links %}
+                                                    <li><a href="{{ link }}" target="_blank"
+                                                           rel="noopener noreferer">{{ link }}</a></li>{% endfor %}
                                             </ul>
                                         {% endif %}
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    {% endfor %}
+                    {% endif %}{% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
 
+    {% if request.user == wishlist.owner %}
+    <div class="row">
+        <div class="col">
+            <div class="card bg-secondary wishlist-page-card mt-3">
+                <div class="card-header wishlist-page-header">
+                    <h3>Appears in</h3>
+                </div>
+                <div class="card-body wishlist-page-header">
+                    {% if wishlist.groups.count %}
+                        <ul>
+                            {% for group in wishlist.groups.all %}
+                                <li>
+                                    <form action="{% url "remove_wishlist_from_group" pk=wishlist.pk %}"
+                                          method="post">
+                                        <input type="hidden" name="group_pk" value="{{ group.pk }}">
+                                        <input type="hidden" name="action" value="remove_wishlist_from_group">
+                                        {% csrf_token %}
+                                        <a href="{% url "group_detail" pk=group.pk %}">{{ group.name }}</a>
+                                        <button type="submit" class="btn btn-outline-danger btn-sm">Remove</button>
+                                    </form>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    {% else %}
+                        <p>This wishlist does not appear in any groups! Add it to a group to share it with others.</p>
+                    {% endif %}
+                </div>
+                <div class="card-footer wishlist-page-header">
+                    {% if request.user == wishlist.owner %}
+                        <form action="{% url "add_wishlist_to_group" pk=wishlist.pk %}" method="post">
+                            <input type="hidden" name="next" value="{{ request.path }}">
+                            <input type="hidden" name="action" value="add_wishlist_to_group">
+                            {% csrf_token %}
+                            <div class="input-group">
+                                <label class="input-group-text" for="group">Add to Group</label>
+                                <select class="form-select" name="group_pk">
+                                    <option selected>Choose...</option>
+                                    {% for group in user.groups.all %}
+                                        {% if group not in wishlist.groups.all %}
+                                            <option value="{{ group.pk }}">{{ group.name }}</option>
+                                        {% endif %}
+                                    {% endfor %}
+                                </select>
+                                <button type="submit" class="btn btn-success">Add</button>
+                            </div>
+                        </form>
+                    {% endif %}
                 </div>
             </div>
         </div>
+    {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/gifter/wishlist_list.html b/templates/gifter/wishlist_list.html
index cf2b969..d8d987b 100644
--- a/templates/gifter/wishlist_list.html
+++ b/templates/gifter/wishlist_list.html
@@ -5,7 +5,16 @@ <h2 class="mt-3">My Wishlists</h2>
     {% for wishlist in object_list %}
         <div class="card bg-dark mb-2">
             <div class="card-body">
-                <a href="{% url "wishlist_detail" group_pk=wishlist.group.pk pk=wishlist.id %}">{{ wishlist.group.name }} - {{ wishlist.title }}</a>
+                <a href="{% url "wishlist_detail" pk=wishlist.id %}">{{ wishlist.title }}</a> -
+                {% if wishlist.groups.count == 0 %}
+                    <small>Not shared</small>
+                {% endif %}
+                {% if wishlist.groups.count == 1 %}
+                    <small>Shared in {{  wishlist.groups.first.name }}</small>
+                {% endif %}
+                {% if wishlist.groups.count > 1 %}
+                    <small>Shared in {{  wishlist.groups.count }} groups</small>
+                {% endif %}
             </div>
         </div>
     {% endfor %}