diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index d09edc3..baed251 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -1,25 +1,49 @@
 @import 'https://fonts.googleapis.com/css?family=Roboto:300,400,500';
 
 body {
-  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
-  color: #555;
   margin: 0 auto;
   padding: 15px;
   max-width: 50em;
 }
 
+body, input, button {
+  font-family: "Roboto", "Helvetica", "Arial", sans-serif;
+  color: #555;
+}
+
 h1 {
   text-align: center;
+  clear: both;
+}
+
+form {
+  display: block;
 }
 
 input {
   width: 100%;
   padding: 12px 12px;
-  margin: 8px 0;
+  margin: 4px 0;
   box-sizing: border-box;
   font-size: 1.5em;
 }
 
+form button {
+  float: right;
+  margin: 4px 0 15px 0;
+}
+
+button {
+  border: none;
+  background: none;
+  cursor: pointer;
+}
+
+form button, body > button {
+  font-size: 1.5em;
+  padding: 10px 0 10px 20px;
+}
+
 table {
   width: 100%;
   border-collapse: collapse;
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 998497e..3759159 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -20,14 +20,14 @@
 <h1>Money Tracking</h1>
 
 <form name="newExpense" novalidate ng-submit="newExpense.$valid && submit(expense)">
-  Amount: <input type="number" step="0.01" ng-model="expense.amount">
-  Comment: <input type="text" ng-model="expense.comment"><br>
+  <input type="number" step="0.01" placeholder="Amount" ng-model="expense.amount">
+  <input type="text" placeholder="Comment" ng-model="expense.comment">
   <button type="submit">Add</button>
 </form>
 
 <h1>{{ selectedMonthName() }}</h1>
-<button ng-click="changeMonth(expenses._links.previous.href)">&lt; previous</button>
-<button ng-click="changeMonth(expenses._links.next.href)">next &gt;</button>
+<!--<button ng-click="changeMonth(expenses._links.previous.href)">&lt; previous</button>-->
+<!--<button ng-click="changeMonth(expenses._links.next.href)">next &gt;</button>-->
 <p>Total: {{ calculateTotal() | number: 2 }} €</p>
 <table>
   <tr>