diff --git a/map/mixins.py b/map/mixins.py
new file mode 100644
index 0000000..2f72cc7
--- /dev/null
+++ b/map/mixins.py
@@ -0,0 +1,8 @@
+class QuickActionsMixin:
+    def get_quick_actions(self):
+        return []
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['quick_actions'] = self.get_quick_actions()
+        return context
diff --git a/map/static/map/style.css b/map/static/map/style.css
index eba67fe..e1c5921 100644
--- a/map/static/map/style.css
+++ b/map/static/map/style.css
@@ -2,3 +2,7 @@
     height: 70vh;
     margin-top: 1rem;
 }
+
+.messages-container {
+    margin-top: 1em;
+}
\ No newline at end of file
diff --git a/map/templates/map/base.html b/map/templates/map/base.html
index 6623205..e654d9b 100644
--- a/map/templates/map/base.html
+++ b/map/templates/map/base.html
@@ -25,14 +25,18 @@
 {% include 'map/navbar.html' %}
 
 <div class="container">
-    {% for message in messages %}
-        <div class="alert alert-dismissible alert-{{ message.tags }} fade show" role="alert">
-            {{ message|safe }}
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-            </button>
+    {% if messages %}
+        <div class="messages-container">
+            {% for message in messages %}
+                <div class="alert alert-dismissible alert-{{ message.tags }} fade show" role="alert">
+                    {{ message|safe }}
+                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+            {% endfor %}
         </div>
-    {% endfor %}
+    {% endif %}
 
     <div class="row">
         <div class="col-12">
diff --git a/map/templates/map/change_location.html b/map/templates/map/change_location.html
new file mode 100644
index 0000000..6aa080f
--- /dev/null
+++ b/map/templates/map/change_location.html
@@ -0,0 +1,12 @@
+{% extends 'map/base.html' %}
+{% load crispy_forms_filters %}
+
+{% block h1 %}Change your location{% endblock %}
+
+{% block content %}
+    <form method="post">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <button type="submit" class="btn btn-primary">Save</button>
+    </form>
+{% endblock %}
diff --git a/map/urls.py b/map/urls.py
index 8cf724b..1b91adf 100644
--- a/map/urls.py
+++ b/map/urls.py
@@ -1,6 +1,8 @@
 from django.urls import path
+
 from map import views
 
 urlpatterns = [
     path('', views.MapView.as_view(), name='map'),
+    path('change-location/<int:pk>', views.EditLocationView.as_view(), name='change-location'),
 ]
diff --git a/map/views.py b/map/views.py
index 407a483..466654a 100644
--- a/map/views.py
+++ b/map/views.py
@@ -1,10 +1,46 @@
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.views.generic import ListView
+from django.shortcuts import redirect
+from django.urls import reverse_lazy
+from django.views import generic
 
 from map import models
+from map.mixins import QuickActionsMixin
 
 
-class MapView(LoginRequiredMixin, ListView):
+class MapView(LoginRequiredMixin, QuickActionsMixin, generic.ListView):
     model = models.FriendLocation
     context_object_name = 'locations'
     template_name = 'map/map.html'
+
+    def get_quick_actions(self):
+        return [
+            {
+                'url': reverse_lazy('change-location', kwargs={'pk': self.request.user.location.pk}),
+                'category': 'secondary',
+                'display': f'Change your location'
+            },
+        ]
+
+
+class EditLocationView(LoginRequiredMixin, generic.UpdateView):
+    model = models.FriendLocation
+    context_object_name = 'location'
+    template_name = 'map/change_location.html'
+
+    fields = [
+        'latitude',
+        'longitude',
+        'start_date',
+        'end_date',
+    ]
+
+    success_url = reverse_lazy('map')
+
+    def dispatch(self, request, *args, **kwargs):
+        obj = self.get_object()  # type: models.FriendLocation
+        if obj is None or obj.friend != request.user:
+            messages.warning(request, "This is not your location.")
+            return redirect('map')
+
+        return super().dispatch(request, *args, **kwargs)