diff --git a/src/main/resources/static/css/app.css b/src/main/resources/static/css/app.css
index 5a1246c..afd487e 100644
--- a/src/main/resources/static/css/app.css
+++ b/src/main/resources/static/css/app.css
@@ -5,6 +5,11 @@ body {
 	background-size: cover;
 }
 
+label {
+	font-family: "Yanone Kaffeesatz", sans-serif;
+	color: #eee;
+}
+
 .row-margin {
 	padding: 5 ex;
 	margin: 20 px;
@@ -15,13 +20,6 @@ body {
 	font-size: 120%;
 }
 
-.input-heading {
-	font-family: "Yanone Kaffeesatz", sans-serif;
-	font-weight: 400;
-	font-size: 120%;
-	color: #eee;
-}
-
 .listing {
 	margin: auto;
 	margin-top: 2em;
diff --git a/src/main/resources/static/partials/transaction-list.html b/src/main/resources/static/partials/transaction-list.html
index ab21730..4b55164 100644
--- a/src/main/resources/static/partials/transaction-list.html
+++ b/src/main/resources/static/partials/transaction-list.html
@@ -1,9 +1,14 @@
 <div class="container">
 	<div class="row">
 	
-		<div><select ng-model='account' ng-change='refreshList()' ng-options="account.name for account in accounts track by account.id"></select></div>
+		<div>
+			<select
+				ng-model='account'
+				ng-change='refreshList()'
+				ng-options="account.name for account in accounts track by account.id"></select>
+		</div>
 		
-		<div class="col-md-offset-1 col-md-10 col-xs-12">
+		<div class="col-md-offset-4 col-md-4 col-xs-offset-1 col-xs-10">
 			
 			<br />
 				
@@ -15,13 +20,11 @@
 			</div>
 			
 			<div class="row">
-				<form name="form" ng-submit="postTransaction()" class="col-md-offset-4 col-xs-offset-1">
-				
-					<br />
+				<form name="form" ng-submit="postTransaction()">
 				
 					<div class="row form-group">
-						<label for="inputAmount">Betrag:</label>
-						<input id="inputAmount"	
+						<label for="amountInput">Betrag</label>
+						<input id="amountInput"	
 							ng-model='transaction.amount'
 							type='text'
 							required
@@ -32,67 +35,50 @@
 						<span ng-show="form.amount.$error.pattern"><br/>The value is not valid!</span>
 					</div>
 					
-					<br />
-					
-					<div class="row">
-						<div class="col-md-1 col-xs-2 input-heading">Kategorie:</div>
-						<div class="col-md-11 col-xs-10">
-							<select
-								ng-model='transaction.category'
-								size='1' ng-options="category.name for category in categories track by category._links.self.href"
-								ng-change='checkCategory()'
-								class="form-control"></select>
-						</div>
+					<div class="row form-group">
+						<label for="categorySelect">Kategorie</label>
+						<select
+							id="categorySelect"
+							ng-model='transaction.category'
+							size='1'
+							ng-options="category.name for category in categories track by category._links.self.href"
+							ng-change='checkCategory()'
+							class="form-control"></select>
 					</div>
 					
-					<br />
-					
-					<div class="row">
-						<div class="col-md-1 col-xs-2 input-heading">Datum:</div>
-						<div class="col-md-11 col-xs-10">
-							<input ng-model='transaction.date'
-								type='date'
-								placeholder="yyyy-MM-dd"
-								required
-								class="form-control" />
-						</div>
+					<div class="row form-group">
+						<label for="dateInput">Datum</label>
+						<input
+							id="dateInput"
+							ng-model='transaction.date'
+							type='date'
+							placeholder="yyyy-MM-dd"
+							required
+							class="form-control" />
 					</div>
 					
-					<br />
-						
-					<div class="row">
-						<div class="col-md-1 col-xs-2 input-heading">Notiz:</div>
-						<div class="col-md-11 col-xs-10">
-							<input ng-model="transaction.description"
-								uib-typeahead="address for address in updateSuggestions($viewValue)"
-								typeahead-loading="loadingLocations"
-								class="form-control">
-						</div>
+					<div class="row form-group">
+						<label for="descriptionInput">Notiz</label>
+						<input
+							id="descriptionInput"
+							ng-model="transaction.description"
+							uib-typeahead="address for address in updateSuggestions($viewValue)"
+							typeahead-loading="loadingLocations"
+							class="form-control">
 					</div>
-
-					<br />
 	
-					<div class="row">
-						<div class="col-md-1 col-xs-2 input-heading">Auslage:</div>
-						<div class="col-md-11 col-xs-10">
-							<!-- label class='userLabel'><input name='expenseBy' ng-model='transaction.creditor' ng-value='none' type='radio' checked='checked' />Keine</label -->
-							<!-- label ng-repeat="user in accountUsers" class='userLabel'><input name='expenseBy' ng-model='$parent.transaction.creditor' ng-value='{{user.name}}' type='radio' />{{user.name}}</label -->
-							
-							<label class='userLabel'><input id='noCreditorRadioButton' name='expenseBy' ng-model='transaction.creditor' type='radio' value='' checked='checked' />Keine&nbsp;</label>
-							<label class='userLabel' ng-repeat="user in accountUsers"><input name='expenseBy' ng-model='$parent.transaction.creditor' type='radio' value="{{user._links.self.href}}" />{{user.name}}&nbsp;</label>
+					<div class="row form-group">
+						<label for="expenseInput">Auslage</label>
+						<div>
+							&nbsp;<label class='userLabel'><input id='noCreditorRadioButton' name='expenseBy' ng-model='transaction.creditor' type='radio' value='' checked='checked' />&nbsp;Keine&nbsp;&nbsp;</label>
+							<label class='userLabel' ng-repeat="user in accountUsers"><input name='expenseBy' ng-model='$parent.transaction.creditor' type='radio' value="{{user._links.self.href}}" />&nbsp;{{user.name}}&nbsp;&nbsp;</label>
 						</div>
 					</div>
 					
-					<br />
-					
-					<div class="row">
-						<div class="col-md-6 text-center">
-							<input type="submit" ng-disabled="form.amount.$error.pattern" class="btn btn-primary" />
-						</div>
+					<div class="row form-group" style="text-align:center;">
+						<input type="submit" ng-disabled="form.amount.$error.pattern" class="btn btn-primary" />
 					</div>
 					
-					<br />
-					
 				</form>
 			</div>
 	
@@ -118,7 +104,7 @@
 				<span ng-repeat="user in accountUsers">{{user.name}} {{user.outstandings | number : 2}}&nbsp;€<br/></span>
 			</div>
 			
-			<div ng-controller="ModalDemoCtrl">
+			<!-- div ng-controller="ModalDemoCtrl">
 				<script type="text/ng-template" id="myModalContent.html">
 					<div class="modal-header">
 						<h3 class="modal-title">I'm a modal!</h3>
@@ -142,7 +128,7 @@
 				<button type="button" class="btn btn-default" ng-click="open('sm')">Small modal</button>
 				<button type="button" class="btn btn-default" ng-click="toggleAnimation()">Toggle Animation ({{ animationsEnabled }})</button>
 				<div ng-show="selected">Selection from a modal: {{ selected }}</div>
-			</div>
+			</div-->
 
 			<!-- div>
 				<pre style="font-size: 75%; color: darkgray;">{{account | json}}</pre>