diff --git a/client/index.html b/client/index.html
index 53582b5..b755a9e 100644
--- a/client/index.html
+++ b/client/index.html
@@ -13,10 +13,11 @@
       <div id="link">
       </div>
       <div id="upload">
-	<form>
+	<div id="upload-buttons">
 	  <input id="file-selector" type="file" name="file"/>
-	  <input id="woot" type="button" name="upload" value="upload"/>
-	</form>
+	  <label class="stylish-button" for="file-selector">Select file to upload</label>
+	  <input class="stylish-button" id="upload-button" type="button" name="upload" value="upload"/>
+	</div>
 	<progress id="progress-bar"></progress>
       </div>
       <div id="file-list">
diff --git a/client/style.css b/client/style.css
index c54ac77..334a082 100644
--- a/client/style.css
+++ b/client/style.css
@@ -3,10 +3,8 @@ body {
     font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;b3
 }
 
-#woot {
+.stylish-button {
     background-color: #ec567c;
-    float: right;
-    height: 32px;
     margin: 0;
     padding: 5px 20px;
     border: 0;
@@ -40,6 +38,11 @@ body {
     padding: 20px;
 }
 
+
+#file-list > ul {
+    padding: 0;
+}
+
 #file-list > ul > li {
     position: relative;
     display: block;
@@ -47,6 +50,10 @@ body {
     margin-bottom: -1px;
     background-color: #363636;
     border: 1px solid #bbb;
+    width: 100%;
+    width: -moz-available;          
+    width: -webkit-fill-available;    
+
 }
 
 #file-list > ul > li:first-child {
@@ -59,3 +66,41 @@ body {
     border-bottom-right-radius: 4px;
     border-bottom-left-radius: 4px;
 }
+
+#file-list > ul > li > span.delete-button {
+    float: right;
+}
+
+#upload-buttons {
+    text-align: right;
+}
+
+label, input {
+    font-size: inherit;
+    padding: 0.2em;
+    margin: 0.1em 0.2em;
+    box-sizing: content-box;
+}
+
+#file-selector {
+    width: 0.1px;
+    height: 0.1px;
+    opacity: 0;
+    overflow: hidden;
+    position: absolute;
+    z-index: -1;
+}
+
+#progress-bar {
+    background-color: #ec567;
+    height: 25px;
+    padding: 3px;
+    width: 100%;
+    width: -moz-available;          
+    width: -webkit-fill-available;    
+    margin-top: 10px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    -webkit-box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+    box-shadow: 0 1px 5px #000 inset, 0 1px 0 #444;
+}