diff --git a/css/style.css b/css/style.css
index 18e72a6..f4eb7f5 100755
--- a/css/style.css
+++ b/css/style.css
@@ -19,8 +19,9 @@ input[type="checkbox"]
 
 input[type="submit"]
 {
-	background-color:#E0E0FF;
-	font-size:16pt;
+	font-size: 14pt;
+	margin-top: 20px;
+	margin-bottom: 20px;
 }
 
 label
@@ -73,4 +74,4 @@ div.hidden
 h1
 {
 	text-align:center;
-}
\ No newline at end of file
+}
diff --git a/keyControlPanel.php b/keyControlPanel.php
index 0e170df..e3ea60d 100755
--- a/keyControlPanel.php
+++ b/keyControlPanel.php
@@ -95,7 +95,6 @@
 					CreateHeadline("Key Control Panel");
 					CreateInfoBox($formState);
 					CreateAccessBox($formState);
-          echo $formState;
 					
 					switch ($formState)
 					{
@@ -138,7 +137,7 @@
 					}
 				?>
 				<div class="row">
-					<input class="form-control" type="submit" name="submit" value="Absenden"/>
+					<input class="form-control btn-success" type="submit" name="submit" value="Absenden"/>
 				</div>
 				<input type="hidden" value="<?php /*Hidden input with previously generated id - used for preventing double posts*/ echo $_SESSION['submissionId'];?>" name="submissionId"> 
 			</form>
@@ -284,4 +283,4 @@
 		}
 		return KEYSTATE_NONEXISTENT;
 	}
-?>
\ No newline at end of file
+?>
diff --git a/keyTable.php b/keyTable.php
index 03b2aa7..4c19af1 100755
--- a/keyTable.php
+++ b/keyTable.php
@@ -128,9 +128,9 @@
 					}
 					
 					CreateRowHeader();
-					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control\" name=\"changesConfirm\" value=\"Confirm Changes\"/>\n  </div>\n";
+					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control btn-success\" name=\"changesConfirm\" value=\"Confirm Changes\"/>\n  </div>\n";
 					echo "  <div class=\"col-2\"></div>\n";
-					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control\" name=\"changesDiscard\" value=\"Discard Changes\"/>\n  </div>\n";
+					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control btn-danger\" name=\"changesDiscard\" value=\"Discard Changes\"/>\n  </div>\n";
 					echo "</div>\n";
 					
 					// Hidden input with previously generated id - used for preventing double posts
@@ -144,9 +144,9 @@
 					CreateTextBox("Key file name", "keyFile", $keyFile);
 					
 					CreateRowHeader();
-					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control\" name=\"keyGenNew\" value=\"Generate New Key File\"/>\n  </div>\n";
+					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control btn-success\" name=\"keyGenNew\" value=\"Generate New Key File\"/>\n  </div>\n";
 					echo "  <div class=\"col-2\"></div>\n";
-					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control\" name=\"keyGenAppend\" value=\"Append existing Key File\"/>\n  </div>\n";
+					echo "  <div class=\"col-5\">\n    <input type=\"submit\" class=\"form-control btn-warning\" name=\"keyGenAppend\" value=\"Append existing Key File\"/>\n  </div>\n";
 					echo "</div>\n";
 					
 					// Hidden input with previously generated id - used for preventing double posts
diff --git a/student_questionnaire.php b/student_questionnaire.php
index e3fbfe4..599e900 100755
--- a/student_questionnaire.php
+++ b/student_questionnaire.php
@@ -83,7 +83,7 @@
 					CreateQuestionnaireElement("comment", $questionnaire, $_POST);
 				?>
 				<div class="row">
-					<input class="form-control" type="submit" name="submit" value="Absenden"/>
+					<input class="form-control btn-success" type="submit" name="submit" value="Absenden"/>
 				</div>
 			</form>
 		</div>
diff --git a/tutor_questionnaire.php b/tutor_questionnaire.php
index 3e94efb..eb01e3c 100755
--- a/tutor_questionnaire.php
+++ b/tutor_questionnaire.php
@@ -77,7 +77,7 @@
 					CreateQuestionnaireElement("comment", $questionnaire, $_POST);
 				?>
 				<div class="row">
-					<input class="form-control" type="submit" name="submit" value="Absenden"/>
+					<input class="form-control btn-success" type="submit" name="submit" value="Absenden"/>
 				</div>
 			</form>
 		</div>
@@ -97,4 +97,4 @@
 			case KEYSTATE_USED: CreateMessageBox(MSG_DANGER, "Achtung!", "Der angegebene Code ist wurde bereits eingelöst. Es darf pro Student nur eine ESE-Tasse ausgegeben werden."); break;
 		}
 	}
-?>
\ No newline at end of file
+?>