diff --git a/lostplaces/lostplaces_app/static/main.css b/lostplaces/lostplaces_app/static/main.css
index d0c640b..87f6f12 100644
--- a/lostplaces/lostplaces_app/static/main.css
+++ b/lostplaces/lostplaces_app/static/main.css
@@ -100,7 +100,8 @@ body {
   border: none;
   padding: 8px 14px;
   border-radius: 2px;
-  font-weight: bold; }
+  font-weight: bold;
+  cursor: pointer; }
   .LP-Button:active {
     background-color: #76323F;
     color: #f9f9f9; }
diff --git a/lostplaces/lostplaces_app/templates/place/place_delete.html b/lostplaces/lostplaces_app/templates/place/place_delete.html
index af9e948..246fa69 100644
--- a/lostplaces/lostplaces_app/templates/place/place_delete.html
+++ b/lostplaces/lostplaces_app/templates/place/place_delete.html
@@ -4,15 +4,17 @@
 {% block title %}Lost Place Deletion{% endblock %}
 
 {% block maincontent %}
-<form class="" method="POST" enctype="multipart/form-data">
-    <fieldset class="">
-        <legend class="">Delete place</legend>
+
+<form class="LP-Form" method="POST">
+    <fieldset class="LP-Form__Fieldset">
+        <legend class="LP-Form__Legend">Place löschen</legend>
         {% csrf_token %}
-        <p>Are you sure you want to delete {{place.name}}?</p>
-        {{ form.as_p }}
-        <div class="">
-            <input type="submit" class="LP-Button" value="Delete"/>
-        </div>
-    </fieldset>
+        <div class="LP-Form__Composition LP-Form__Composition--breakable">
+			<p class="LP-Paragraph">Are you sure you want to delete "{{place.name}}"?</p>
+			<div class="LP-Form__Composition">
+				<input type="submit" class="LP-Button" value="Löschen"/>
+			</div>
+		</div>
+	</fieldset>
 </form>
 {% endblock maincontent %}
\ No newline at end of file
diff --git a/lostplaces/templates/registration/login.html b/lostplaces/templates/registration/login.html
index ffe8e03..15f0d77 100644
--- a/lostplaces/templates/registration/login.html
+++ b/lostplaces/templates/registration/login.html
@@ -5,11 +5,24 @@
 
 {% block maincontent %}
 
-<h2>Login</h2>
-<form method="post">
-    {% csrf_token %}
-    {{ form.as_p }}
-    <button type="submit">Login</button>
+<form class="LP-Form" method="POST" enctype="multipart/form-data">
+    <fieldset class="LP-Form__Fieldset">
+        <legend class="LP-Form__Legend">Login</legend>
+        {% csrf_token %}
+        <div class="LP-Form__Composition LP-Form__Composition--breakable">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.username %}
+            </div>
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.password %}
+            </div>
+        </div>
+
+        <div class="LP-Form__Composition">
+            <input type="submit" class="LP-Button" value="Login"/>
+        </div>
+    </fieldset>
+
 </form>
 
 {% endblock maincontent %}
\ No newline at end of file