diff --git a/templates/register.html b/templates/register.html
index e0706cc..1957c16 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -48,24 +48,29 @@
         </div>
         <div class="container col-lg-12" id="content">
             <form id="loginForm" action="/api/v1/register" method="POST" class="center-block">
-                <label for="email">E-Mail</label>
-                <input type="text" name="email" /><br />
+                <div class="form-group">
+                    <label for="email">E-Mail</label>
+                    <input type="text" name="email" class="form-control" placeholder="E-Mail" />
+                </div>
 
-                <label for="name">Name</label>
-                <input type="text" name="name" /><br />
+                <div class="form-group">
+                    <label for="name">Name</label>
+                    <input type="text" name="name" class="form-control" placeholder="Name"  />
+                </div>
 
-                <label for="password">Password</label>
-                <input type="password" name="password" id="password" /><br />
-
-                <label for="password">Verify Password</label>
-                <input type="password" id="password_confirm" />
-                <span id="divCheckPasswordMatch"></span><br />
+                <div class="form-group">
+                    <label for="password">Password</label>
+                    <input type="password" name="password" id="password" class="form-control" placeholder="Password" />
+                    <input type="password" id="password_confirm" class="form-control" placeholder="Verify password" />
+                </div>
+                
+                <div id="divCheckPasswordMatch"></div>
 
                 <div id="invalidCredentials">
                     Username already exists
                 </div>
 
-                <input type="submit" value="Login" />
+                <input type="submit" value="Login" class="form-control" />
             </form>
         </div>
     </body>