diff --git a/recipes/templates/add-version.html b/recipes/templates/add-version.html
deleted file mode 100644
index fb403db..0000000
--- a/recipes/templates/add-version.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "base_main.html" %}
-{% comment %}
-	Barn Web App - A collection of web-apps for my family's personal use,
-	including a recipe database.
-	Copyright © 2023 Benjamin Stadlbauer
-
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or (at
-	your option) any later version.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-	General Public License for more details.
-
-	This program comes with a copy of the GNU Affero General Public License
-	file at the root of this project.
-{% endcomment %}
-{% block title %}{{ recipe.title }}{% endblock %}
-{% block main %}
-<form action="" method="post" id="add-version-form">
-	{%csrf_token %}
-	<table>
-		{{ version_form.as_table }}
-	</table>
-	{{ ingredients_formset.management_form }}
-	{% for ingredient_form in ingredients_formset %}
-		{{ ingredient_form.as_div }}
-	{% endfor %}
-	<button id="add-ingredient" type="button">Add Ingredient</button>
-	<input type="submit" value="Submit">
-</form>
-
-<script>
-	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
-	let addIngredientButton = document.querySelector("#add-ingredient");
-	let form = document.querySelector("#add-version-form");
-	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
-
-	addIngredientButton.addEventListener('click', addIngredient);
-
-	function addIngredient(e) {
-		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
-		e.preventDefault();
-
-		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
-		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
-
-		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
-
-		form.insertBefore(newIngredientDiv, addIngredientButton);
-		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
-	}
-
-</script>
-
-{% endblock %}
diff --git a/recipes/templates/edit-version.html b/recipes/templates/edit-version.html
deleted file mode 100644
index 0659431..0000000
--- a/recipes/templates/edit-version.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% extends "base_main.html" %}
-{% comment %}
-	Barn Web App - A collection of web-apps for my family's personal use,
-	including a recipe database.
-	Copyright © 2023 Benjamin Stadlbauer
-
-	This program is free software: you can redistribute it and/or modify it
-	under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or (at
-	your option) any later version.
-
-	This program is distributed in the hope that it will be useful, but
-	WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero
-	General Public License for more details.
-
-	This program comes with a copy of the GNU Affero General Public License
-	file at the root of this project.
-{% endcomment %}
-{% block title %}{{ recipe.title }}{% endblock %}
-{% block main %}
-<form action="" method="post" id="edit-version-form"> {# TODO refactor with add-version.html#}
-	{%csrf_token %}
-	<table>
-		{{ version_form.as_table }}
-	</table>
-	{{ ingredients_formset.management_form }}
-	{% for ingredient_form in ingredients_formset %}
-		{{ ingredient_form.as_div }}
-	{% endfor %}
-	<button id="add-ingredient" type="button">Add Ingredient</button>
-	<input type="submit" value="Submit">
-</form>
-
-<script>
-	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
-	let addIngredientButton = document.querySelector("#add-ingredient");
-	let form = document.querySelector("#edit-version-form");
-	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
-
-	addIngredientButton.addEventListener('click', addIngredient);
-
-	function addIngredient(e) {
-		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
-		e.preventDefault();
-
-		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
-		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
-
-		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
-
-		form.insertBefore(newIngredientDiv, addIngredientButton);
-		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
-	}
-
-</script>
-
-{% endblock %}
diff --git a/recipes/templates/add-recipe.html b/recipes/templates/recipe-form.html
similarity index 92%
rename from recipes/templates/add-recipe.html
rename to recipes/templates/recipe-form.html
index f696794..0d3de9f 100644
--- a/recipes/templates/add-recipe.html
+++ b/recipes/templates/recipe-form.html
@@ -19,12 +19,12 @@
 {% endcomment %}
 {% block title %}{{ recipe.title }}{% endblock %}
 {% block main %}
-<form action="" method="post" id="add-version-form">
+<form action="" method="post" id="version-form">
 	{%csrf_token %}
-	{{ recipe_form.as_div }}
-	<table>
-		{{ version_form.as_table }}
-	</table>
+	{% if recipe_form %}
+		{{ recipe_form.as_div }}
+	{% endif %}
+	{{ version_form.as_div }}
 	{{ ingredients_formset.management_form }}
 	{% for ingredient_form in ingredients_formset %}
 		{{ ingredient_form.as_div }}
@@ -36,7 +36,7 @@
 <script>
 	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
 	let addIngredientButton = document.querySelector("#add-ingredient");
-	let form = document.querySelector("#add-version-form");
+	let form = document.querySelector("#version-form");
 	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
 
 	addIngredientButton.addEventListener('click', addIngredient);
diff --git a/recipes/views.py b/recipes/views.py
index d7eb098..146b32e 100644
--- a/recipes/views.py
+++ b/recipes/views.py
@@ -85,7 +85,7 @@ def add_recipe(request):
 		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
 
-	return render(request, 'add-recipe.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
 
 @login_required
 def edit_recipe(request, slug):
@@ -135,7 +135,7 @@ def add_version(request, slug):
 		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
 
-	return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
 
 @login_required
 def edit_version(request, slug_recipe, slug_version):
@@ -164,4 +164,4 @@ def edit_version(request, slug_recipe, slug_version):
 		version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
 
-	return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})