diff --git a/core/static/core/index.css b/core/static/core/index.css
index ed1b713..ecb7555 100644
--- a/core/static/core/index.css
+++ b/core/static/core/index.css
@@ -26,3 +26,8 @@ ul > li input.button {
 ul > li {
   padding: 0.4rem;
 }
+
+
+.small-text {
+  font-size: 0.9rem;
+}
diff --git a/core/static/core/team.css b/core/static/core/team.css
index 9be42fa..b18c950 100644
--- a/core/static/core/team.css
+++ b/core/static/core/team.css
@@ -4,49 +4,64 @@
 
 .team-content {
 	position: absolute;
-    top: 50%;  
-    left: 50%; 
+    top: 50%;
+    left: 50%;
     transform: translate(-50%, -50%);
 }
 
 .team-heading {
 	padding: 5px;
 }
+.no {
+	text-decoration: none;
+	color: #a4a4a4;
+	display: inline-block;
+	padding: 8px 12px;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	transition: background-color 0.3s;
+}
+
+a:visited {
+	color: #a4a4a4;
+}
 
-input {
+.no, input {
 	outline: none;
 	background: var(--team-bg);
-	border: 0px solid var(--team-bg);
+	border: 0 solid var(--team-bg);
 	color: #767b82;
 }
 
-input[type=submit] {
-	border: 0px solid var(--team-bg);
+.no, input[type=submit] {
+	border: 0 solid var(--team-bg);
 	/*box-shadow: 0px 0px 0px 4px #fff;*/
 	background: #fff;
-	color: white;
 	font: inherit;
-	font-family: inherit;
 	margin-left: 0;
-	border-radius: 0 0.3rem 0.3rem 0;
+	border-radius: 0.3rem 0 0  0.3rem;
 
 	color: #a4a4a4;
 	font-weight: bold;
 }
+.no {
+	border-radius: 0 0.3rem 0.3rem 0;
 
-input[type=submit]:hover {
+}
+
+.no, input[type=submit]:hover {
   background: rgba(255, 255, 255, 0.95);
   transition-duration: .3s;
   color: #848a91;
 }
-input[type=submit]:active {
+.no, input[type=submit]:active {
   background: rgba(255, 255, 255, 0.90);
   color: #000;
 }
 
 .input-padding {
 	margin: 0;
-	padding: 0;	
+	padding: 0;
 	/*
 	border: 0px solid #d5d5d5;
 	border-radius: 0 0.3rem 0.3rem 0;
@@ -54,6 +69,6 @@ input[type=submit]:active {
 	height: 80%;*/
 }
 
-input::placeholder {
+.no, input::placeholder {
   color: #bdb9b9;
-}
\ No newline at end of file
+}
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index cb52956..89c3799 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -36,6 +36,15 @@ <h3>
       {% blocktranslate with team=request.user.current_team.name %}
         your team: {{ team }}
       {% endblocktranslate %}
+      {% if not IN_HUNT or request.user.team.hunt.allow_creation_post_start %}
+        <a class="button" href="{% url 'team_invite' %}">{% translate "invite more team members" %}</a>
+
+          <span class="small-text">
+            {% blocktranslate %}
+              to switch teams, simply join a new team via the qr code or url
+            {% endblocktranslate %}
+          </span>
+      {% endif %}
     {% endif %}
   </h3>
   <ul class="nodot">
diff --git a/core/templates/core/team_leave.html b/core/templates/core/team_leave.html
new file mode 100644
index 0000000..9dff901
--- /dev/null
+++ b/core/templates/core/team_leave.html
@@ -0,0 +1,32 @@
+{% extends "core/base.html" %}
+{% load i18n %}
+{% load static %}
+
+{% block title %}
+    {% translate "Make a Team" %}
+{% endblock %}
+
+{% block extracss %}
+    <link rel="stylesheet" href="{% static 'core/team.css' %}"/>
+{% endblock %}
+
+<!--
+{% block header %}
+{% endblock %}
+-->
+
+{% block body %}
+    <div class="team-content">
+        <div class="team-heading">
+            {% translate "Are you sure you want to leave your team?" %}
+        </div>
+        <form action="{% url 'team_leave' %}" method="post">
+            {% csrf_token %}
+            {{ form }}
+            <div class="input-padding">
+                <input type="submit" value="Yes"/>
+                <a class="no" href="{% url 'index' %}">{% translate "No" %}</a>  {% comment %}todo: switch url to /team once endpoint has been created {% endcomment %}
+            </div>
+        </form>
+    </div>
+{% endblock %}
diff --git a/core/urls.py b/core/urls.py
index 35d3f39..1293779 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -15,6 +15,7 @@
     path("team/join/", team.join, name="join"),
     path("team/make/", team.make, name="team_new"),
     path("team/invite", team.invite, name="team_invite"),
+    path("team/leave", team.leave, name="team_leave"),
     path("clues", puzzle.logic_clues, name="logic_clues"),
     path("credits", index.credits, name="credits"),
 ]
diff --git a/core/views/team.py b/core/views/team.py
index 65677f1..5d15dcc 100644
--- a/core/views/team.py
+++ b/core/views/team.py
@@ -59,6 +59,12 @@ def make(request):
     if request.method == "POST":
         form = TeamMakeForm(request.POST)
         if form.is_valid():
+            if request.user.in_team:
+                messages.error(
+                    request,
+                    _("You are already in a team. Leave your current team to make a new one."),
+                )
+                return redirect(reverse("team_leave"))
             raw: Team = form.save(commit=False)
             raw.hunt = Hunt.current_hunt() or Hunt.next_hunt()
             raw: Team = form.save()
@@ -81,6 +87,18 @@ def make(request):
     return render(request, "core/team_new.html", dict(form=form))
 
 
+@login_required
+@require_http_methods(["POST", "GET"       ])
+@team_required
+@block_if_current_hunt
+def leave(request):
+    if request.method == "POST":
+        team = Team.objects.get(id=request.user.current_team.id)
+        team.leave(request.user)
+        messages.success(request, _("Left team %(team_name)s") % dict(team_name=team.name))
+        return redirect(reverse("index"))
+    return render(request, "core/team_leave.html")
+
 @login_required
 @require_http_methods(["GET"])
 @team_required