diff --git a/wortschlucker/database.sqlite b/wortschlucker/database.sqlite
index ac96d5e..a6a138d 100644
Binary files a/wortschlucker/database.sqlite and b/wortschlucker/database.sqlite differ
diff --git a/wortschlucker/templates/layout.html b/wortschlucker/templates/layout.html
index faa0332..bcd35ae 100644
--- a/wortschlucker/templates/layout.html
+++ b/wortschlucker/templates/layout.html
@@ -15,11 +15,8 @@
 
 	<div py:def="poll_new_small" class="poll_new_small">
 		<form action="/polls/new" method="post">
-		    
 			<label for="title">Titel des Wortschluckers:</label>
-			
-				<input type="text" id="title" class="poll_new_small_text" name="title" />
-			
+			<input type="text" id="title" class="poll_new_small_text" name="title" />
 			<span py:if="'title' in errors" class="error">${errors.title}</span>
 		    	<input type="submit" name="submit" class="poll_new_small_button" value="N&auml;chster Schritt" />
 		    
diff --git a/wortschlucker/templates/media/images/poll_new_button.png b/wortschlucker/templates/media/images/poll_new_button.png
new file mode 100644
index 0000000..0feda7a
Binary files /dev/null and b/wortschlucker/templates/media/images/poll_new_button.png differ
diff --git a/wortschlucker/templates/media/images/poll_new_button.svg b/wortschlucker/templates/media/images/poll_new_button.svg
new file mode 100644
index 0000000..c27c2e3
--- /dev/null
+++ b/wortschlucker/templates/media/images/poll_new_button.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150"
+   height="35.136715"
+   id="svg3659"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="poll_new_text.svg"
+   inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_text.png"
+   inkscape:export-xdpi="71.400002"
+   inkscape:export-ydpi="71.400002">
+  <defs
+     id="defs3661">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3667" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="148.09314"
+     inkscape:cy="3.1882215"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1476"
+     inkscape:window-height="841"
+     inkscape:window-x="26"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata3664">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.1980891,-1016.46)">
+    <rect
+       y="1006.6364"
+       x="0.35714287"
+       height="46.000061"
+       width="150.69537"
+       id="rect4181"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#454545;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3669"
+       width="146.97169"
+       height="32.136658"
+       x="2.6980891"
+       y="1017.96"
+       rx="16.068357"
+       ry="16.068329" />
+  </g>
+</svg>
diff --git a/wortschlucker/templates/media/images/poll_new_text.png b/wortschlucker/templates/media/images/poll_new_text.png
new file mode 100644
index 0000000..214ce7e
Binary files /dev/null and b/wortschlucker/templates/media/images/poll_new_text.png differ
diff --git a/wortschlucker/templates/media/images/poll_new_text.svg b/wortschlucker/templates/media/images/poll_new_text.svg
new file mode 100644
index 0000000..65e007b
--- /dev/null
+++ b/wortschlucker/templates/media/images/poll_new_text.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="378.13989"
+   height="35.136715"
+   id="svg3659"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="poll_new_text.svg"
+   inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/poll_new_text.png"
+   inkscape:export-xdpi="71.400002"
+   inkscape:export-ydpi="71.400002">
+  <defs
+     id="defs3661">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3667" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="272.39946"
+     inkscape:cy="17.655561"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1476"
+     inkscape:window-height="841"
+     inkscape:window-x="26"
+     inkscape:window-y="51"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata3664">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.1980891,-1016.46)">
+    <rect
+       y="1006.6364"
+       x="0.35714287"
+       height="46"
+       width="380"
+       id="rect4181"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#454545;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3669"
+       width="375.13989"
+       height="32.136715"
+       x="2.6980891"
+       y="1017.96"
+       rx="16.068357"
+       ry="16.068357" />
+  </g>
+</svg>
diff --git a/wortschlucker/templates/media/style.css b/wortschlucker/templates/media/style.css
index 326c3ee..e86ee29 100644
--- a/wortschlucker/templates/media/style.css
+++ b/wortschlucker/templates/media/style.css
@@ -337,8 +337,6 @@ hr { display: none; }
 	padding-right:10px;
 	padding-top:10px;
 	padding-bottom:10px;
-
-
 }	
 
 .poll_new_small_button{
@@ -350,6 +348,51 @@ hr { display: none; }
 	background: url(images/poll_new_small_button.png) no-repeat left top;
 }
 
+.poll_new_text {
+	font-size: 12px;
+	border:none;
+	width:280px;
+	height:18px;
+	background: url(images/poll_new_text.png) no-repeat left top;
+
+	vertical-align:middle;
+	flo at:left;
+	padding-left:10px;
+	margin-left:10px;
+	margin-right:10px;
+	padding-right:10px;
+	padding-top:5px;
+	padding-bottom:5px;
+}	
+
+.poll_new label {
+	font-size: 14px;
+	font-weight:bold;
+	display: inline-block;
+	padding:0px;
+	padding-bottom:5px;
+	padding-left:10px;
+	margin-left:10px;
+	width:90px;
+}
+.poll_new_buttons{
+	border:none;
+	width:100%;
+	text-align:left;
+	float:both;
+	padding-left:20px;
+}
+
+.poll_new_button{
+	font-size: 20px;
+	margin-right:100px;
+	border:none;
+	width:150px;
+	height:36px;
+	background: url(images/poll_new_button.png) no-repeat left top;
+}
+
+
 /* Post */
 
 .post {
diff --git a/wortschlucker/templates/poll_new.html b/wortschlucker/templates/poll_new.html
index c6878f3..f36ab88 100644
--- a/wortschlucker/templates/poll_new.html
+++ b/wortschlucker/templates/poll_new.html
@@ -9,28 +9,29 @@
     </head>
     <body>
         <h1>New poll</h1>
-
-        <form action="" method="post">
-            <p>
-                <label for="author">Your name:</label>
-                <input type="text" id="author" class="form-entry" name="author" />
-                <span py:if="'author' in errors" class="error">${errors.author}</span>
-            </p>
-            <p>
-                <label for="title">Poll name:</label>
-                <input type="text" id="title" class="form-entry" name="title" />
-                <span py:if="'title' in errors" class="error">${errors.title}</span>
-            </p>
-            <p>
-                <label for="description">Description:</label>
-                <input type="text" id="description" class="form-entry" name="description" />
-                <span py:if="'description' in errors" class="error">${errors.description}</span>
-            </p>
-            <p>
-                <input type="submit" name="submit" value="Create poll" />
-                <input type="submit" name="cancel" value="Cancel" />
-            </p>
-        </form>
+	<div class="poll_new">
+		<form action="" method="post">
+		    <p>
+			<label for="author">Your name:</label>
+			<input type="text" id="author" class="poll_new_text" name="author" />
+			<span py:if="'author' in errors" class="error">${errors.author}</span>
+		    </p>
+		    <p>
+			<label for="title">Poll name:</label>
+			<input type="text" id="title" class="poll_new_text" name="title" />
+			<span py:if="'title' in errors" class="error">${errors.title}</span>
+		    </p>
+		    <p>
+			<label for="description">Description:</label>
+			<input type="text" id="description" class="poll_new_text" name="description" />
+			<span py:if="'description' in errors" class="error">${errors.description}</span>
+		    </p>
+		    <div class="poll_new_buttons">
+			<input type="submit" name="submit" class="poll_new_button" value="Create poll" />
+			<input type="submit" name="cancel" class="poll_new_button" value="Cancel" />
+		    </div>
+		</form>
+	</div>
     </body>
 </html>