diff --git a/app/static/main.css b/app/static/main.css
index 29c3360..96dbdf5 100644
--- a/app/static/main.css
+++ b/app/static/main.css
@@ -19,7 +19,7 @@ td {
 }
 
 .error {
-	color: red;
+	color: #a94442;
 }
 
 .pitstop {
diff --git a/app/templates/newPitStopForm.html b/app/templates/newPitStopForm.html
index 4fc3212..e27139f 100644
--- a/app/templates/newPitStopForm.html
+++ b/app/templates/newPitStopForm.html
@@ -1,61 +1,47 @@
 {% extends "layout.html" %}
 
 {% block navigation %}
-	<li><a href='{{ url_for('getPitStops') }}'>Home</a></li>
 	<li><a href='{{ url_for('createPitStopForm') }}' class="active">Create Pitstop</a></li>
 	<li><a href='{{ url_for('getStatistics') }}'>Statistics</a></li>
 {% endblock %}	
 
 {% block body %}
-	<form class="form-horizontal" id='createPitStop' action="{{ url_for('createPitStop') }}" method='post'>
-		<fieldset>
-
-		<!-- Form Name -->
-		<legend>Create Pitstop</legend>
+	<form class='form-horizontal' id='createPitStop' action="{{ url_for('createPitStop') }}" method='post'>
 
 		<!-- Text input-->
-		<div class="control-group">
-			<label class="control-label" for="date">Date of Pitstop</label>
-			<div class="controls">
-				<input id="date" name="date" placeholder="" class="input-large" required="" type="date" value='{{ data.last.date }}' />
-				{% if data.error['date'] %}
-					<p class='error'>{{ data.error['date'] }}</p>
-				{% endif %}
-	    	</div>
-		</div>
-
-		<!-- Text input-->
-		<div class="control-group">
-			<label class="control-label" for="odometer">Odometer</label>
-			<div class="controls">
-				<input id="odometer" name="odometer" placeholder="" class="input-large" required="" type="number" value='{{ data.last.odometer }}' />
-				{% if data.error['odometer'] %}
-					<p class='error'>{{ data.error['odometer'] }}</p>
-				{% endif %}
+		<div class="form-group {% if data.error['date'] %}has-error{% endif %}">
+			<label class="col-sm-2 control-label" for="date">Date of Pitstop</label>
+    		<div class="col-sm-10">
+				<input class="form-control" id="date" name="date" placeholder="" required="" type="date" value='{{ data.last.date }}' />
+				<p class='error'>{{ data.error['date'] }}</p>
 			</div>
 		</div>
 
 		<!-- Text input-->
-		<div class="control-group">
-		  	<label class="control-label" for="litres">Litres</label>
-		  	<div class="controls">
-		    	<input id="litres" name="litres" placeholder="" class="input-large" required="" type="number"  value='{{ data.last.litres }}' />
-				{% if data.error['litres'] %}
-					<p class='error'>{{ data.error['litres'] }}</p>
-				{% endif %}
+		<div class="form-group {% if data.error['odometer'] %}has-error{% endif %}">
+			<label class="col-sm-2 control-label" for="odometer">Odometer (km)</label>
+    		<div class="col-sm-10">
+				<input class="form-control" id="odometer" name="odometer" placeholder="" type="number" value='{{ data.last.odometer }}' />
+				<p class='error'>{{ data.error['odometer'] }}</p>
+			</div>
+		</div>
+
+		<!-- Text input-->
+		<div class="form-group {% if data.error['litres'] %}has-error{% endif %}">
+		  	<label class="col-sm-2 control-label" for="litres">Litres (l)</label>
+    		<div class="col-sm-10">
+		    	<input class="form-control" id="litres" name="litres" placeholder="" type="number"  value='{{ data.last.litres }}' />
+				<p class='error'>{{ data.error['litres'] }}</p>
 			</div>
 		</div>
 		
 		<!-- Button (Double) -->
-		<div class="control-group">
-		  	<label class="control-label" for="buttonLogId"></label>
+		<div class="form-group">
 		  	<div class="controls">
 		    	<button id="buttonLogId" name="buttonLogId" class="btn btn-success" onclick="document.getElementById('createPitStop').submit();">Log Pitstop</button>
-		    	<button id="buttonAbortId" type="button" name="buttonAbortId" class="btn btn-warning" onclick="window.location.href='{{ url_for('getPitStops') }}'">Abort</button>
+		    	<button id="buttonAbortId" name="buttonAbortId" class="btn btn-warning" onclick="window.location.href='{{ url_for('getPitStops') }}'" type="button" >Abort</button>
 			</div>
 		</div>
-		
-	</fieldset>
 </form>
   
 {% endblock %}	
\ No newline at end of file
diff --git a/app/templates/pitstops.html b/app/templates/pitstops.html
index 7517545..a6b77e3 100644
--- a/app/templates/pitstops.html
+++ b/app/templates/pitstops.html
@@ -1,7 +1,6 @@
 {% extends "layout.html" %}
 
 {% block navigation %}
-	<li><a href='{{ url_for('getPitStops') }}' class="active">Home</a></li>
 	<li><a href='{{ url_for('createPitStopForm') }}'>Create Pitstop</a></li>
 	<li><a href='{{ url_for('getStatistics') }}'>Statistics</a></li>
 {% endblock %}	
diff --git a/app/templates/statistics.html b/app/templates/statistics.html
index d54b457..18f0eea 100644
--- a/app/templates/statistics.html
+++ b/app/templates/statistics.html
@@ -1,7 +1,6 @@
 {% extends "layout.html" %}
 
 {% block navigation %}
-	<li><a href='{{ url_for('getPitStops') }}'>Home</a></li>
 	<li><a href='{{ url_for('createPitStopForm') }}'>Create Pitstop</a></li>
 	<li><a href='{{ url_for('getStatistics') }}' class="active">Statistics</a></li>
 {% endblock %}