diff --git a/src/CheckItem.tsx b/src/CheckItem.tsx
new file mode 100644
index 0000000..4ad0ad8
--- /dev/null
+++ b/src/CheckItem.tsx
@@ -0,0 +1,16 @@
+import React from "react";
+
+export default function CheckItem({ label, checked }) {
+  if (checked) {
+    return (
+      <mdui-checkbox disabled checked checked-icon="done">
+        {label}
+      </mdui-checkbox>
+    );
+  }
+  return (
+    <mdui-checkbox disabled unchecked-icon="close">
+      {label}
+    </mdui-checkbox>
+  );
+}
diff --git a/src/Vote.jsx b/src/Vote.jsx
index ca6df21..102f4cd 100644
--- a/src/Vote.jsx
+++ b/src/Vote.jsx
@@ -15,6 +15,7 @@ import moment from "moment-timezone";
 import { breakpoint, confirm, snackbar } from "mdui";
 import { redirect } from "react-router-dom";
 import { capitalizeWords } from "./admin/utils";
+import CheckItem from "./CheckItem";
 export default function Vote() {
   const refs = useRef([]);
   const urlParams = new URLSearchParams(window.location.search);
@@ -233,52 +234,53 @@ export default function Vote() {
           </div>
         )}
         <p />
+        <br />
         <div className="flex-row">
           <mdui-text-field
-            required
             label="Vorname(n)"
             placeholder="Max Erika"
             value={firstName}
             onInput={(e) => setFirstName(capitalizeWords(e.target.value))}
+            icon="person"
           ></mdui-text-field>
           <mdui-text-field
-            required
             label="Nachname"
             placeholder="Mustermann"
             value={lastName}
             onInput={(e) => setLastName(capitalizeWords(e.target.value))}
+            icon="badge"
           ></mdui-text-field>
         </div>
         <p />
-        <div className="flex-row">
+        <div style={{ display: "flex", gap: "20px" }}>
           <mdui-text-field
-            required
             type="number"
             label="Klasse"
             placeholder="11"
             value={grade}
             onInput={(e) => setGrade(e.target.value)}
+            icon="school"
           ></mdui-text-field>
           <mdui-text-field
-            required
             type="number"
-            label="Klassenlistennr."
+            label="Nummer"
             prefix="#"
             placeholder="17"
             value={listIndex}
             onInput={(e) => setListIndex(e.target.value)}
+            icon="format_list_numbered"
           ></mdui-text-field>
         </div>
         <p />
         {extraFields?.map((e, i) => (
           <div key={i}>
             <mdui-text-field
-              required
               label={e}
               value={extraFieldsValues[i]}
               onInput={(e) =>
                 handleInputChange(i, capitalizeWords(e.target.value))
               }
+              icon="edit"
             ></mdui-text-field>
             <p />
           </div>
@@ -291,7 +293,10 @@ export default function Vote() {
           <div key={index}>
             <div className="mdui-prosa">
               {selectCount > 1 && (
-                <h2 ref={(el) => (refs.current[index] = el)}>
+                <h2
+                  style={{ textAlign: "center" }}
+                  ref={(el) => (refs.current[index] = el)}
+                >
                   {index + 1}. Wahl
                 </h2>
               )}
@@ -306,8 +311,12 @@ export default function Vote() {
                   style={{
                     cursor:
                       selected[index] !== e.id && selected.includes(e.id)
-                        ? "default"
+                        ? "not-allowed"
                         : "pointer",
+                    backgroundColor:
+                      selected[index] !== e.id &&
+                      selected.includes(e.id) &&
+                      "rgba(0, 0, 0, 0.5)",
                   }}
                   class={`option-card ${
                     selected[index] === e.id ? "selected" : ""
@@ -329,20 +338,37 @@ export default function Vote() {
                       : !selected.includes(e.id) && select(index, e.id);
                   }}
                 >
-                  <b>{e.title}</b>
-                  <div className="teacher">{e.teacher}</div>
-                  <div className="description">{e.description}</div>
-                  <div className="max">max. {e.max} SchülerInnen</div>
+                  <b className="title">
+                    {e.title}
+                    <mdui-badge
+                      style={{
+                        backgroundColor: "transparent",
+                        color: "white",
+                      }}
+                    >
+                      <mdui-icon name="group"></mdui-icon>
+                      {e.max}
+                    </mdui-badge>
+                  </b>
+                  {e.teacher && (
+                    <div className="teacher">
+                      <mdui-icon name="person"></mdui-icon>
+                      {e.teacher}
+                    </div>
+                  )}
+                  {e.description && (
+                    <div className="description">{e.description}</div>
+                  )}
                 </mdui-card>
               ))}
             </div>
+            <p />
+            <mdui-divider></mdui-divider>
           </div>
         ))}
         <p />
         <br />
-        <mdui-divider></mdui-divider>
-        <p />
-        <br />
+
         <div
           className="button-container"
           ref={(el) => (refs.current[selectCount] = el)}
@@ -384,14 +410,53 @@ export default function Vote() {
           )}
           {submitDisabled() ? (
             <mdui-button disabled end-icon="arrow_forward">
-              Weiter
+              Überprüfen
             </mdui-button>
           ) : (
             <mdui-button onClick={confirmSubmit} end-icon="arrow_forward">
-              Weiter
+              Überprüfen
             </mdui-button>
           )}
         </div>
+        <p />
+        <div
+          className="checks"
+          style={{
+            display: "flex",
+            flexWrap: "wrap",
+            justifyContent: "center",
+          }}
+        >
+          <CheckItem
+            label={"Vorname(n)"}
+            checked={firstName?.trim() && firstName.length >= 2}
+          />
+          <CheckItem
+            label={"Nachname"}
+            checked={lastName?.trim() && lastName.length >= 2}
+          />
+          <div className="break" />
+          <CheckItem label={"Klasse"} checked={grade} />
+          <CheckItem label={"Klassenlistennr."} checked={listIndex} />
+          <div className="break" />
+          {extraFields?.map((e, i) => (
+            <>
+              <CheckItem
+                key={i}
+                label={e}
+                checked={extraFieldsValues[i]?.trim()}
+              />
+              <div className="break" />
+            </>
+          ))}
+          {Array.from({ length: selectCount }).map((e, index) => (
+            <CheckItem
+              key={index}
+              label={`${index + 1}. Wahl`}
+              checked={selected[index] !== "null"}
+            />
+          ))}
+        </div>
       </mdui-card>
     </div>
   );
diff --git a/src/styles.css b/src/styles.css
index 6e61ad0..29d07b7 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -94,6 +94,11 @@ button:not(:disabled):hover {
   background-color: #f89e24;
 }
 
+.break{
+    flex-basis: 100%;
+    height: 0;
+}
+
 .vote {
   width: 600px;
   max-width: 100%;
@@ -147,14 +152,28 @@ button:not(:disabled):hover {
   cursor: not-allowed;
 }
 
-.option .title {
+.title {
   font-size: 20px;
   font-weight: bold;
+  display: flex;
+  justify-content: space-between;
+}
+
+.option-card .teacher{
+  font-size: 14px;
+  font-style: italic;
+  display: flex;
+  align-items: center;
+  gap: 5px;
 }
 
 .option .teacher,
 .option .description {
   font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
 }
 
 .option .description {
@@ -433,6 +452,7 @@ button:not(:disabled):hover {
   gap: 10px;
   padding: 20px;
   flex: 1 1 45%;
+  border: 5px solid transparent;
 }
 
 .option-card.selected {