diff --git a/static/style/style.css b/static/style/style.css
index e0fbc7f..6a9d299 100644
--- a/static/style/style.css
+++ b/static/style/style.css
@@ -49,4 +49,12 @@ body {
 nav> :first-child {
   font-size: 2rem;
   font-weight: bold;
+}
+
+.short-button {
+  align-self: start;
+}
+
+.button-list {
+  flex-direction: row;
 }
\ No newline at end of file
diff --git a/tmpl/task.tmpl b/tmpl/task.tmpl
index e55ef00..22490bc 100644
--- a/tmpl/task.tmpl
+++ b/tmpl/task.tmpl
@@ -31,7 +31,7 @@ window.onload = function(e){
 <p>Library: {{.Library}}</p>
 <p>Filename: {{.Filename}}</p>
 <p>Updated At: {{.UpdatedAt}}</p>
-<button type="button" onclick="window.scrollTo(0,document.body.scrollHeight);">Scroll to Bottom</button>
+<button type="button" onclick="window.scrollTo(0,document.body.scrollHeight);" class="short-button">Scroll to Bottom</button>
 <div class="log">
     {{range $t := .Log}}
         <p>
@@ -39,6 +39,6 @@ window.onload = function(e){
         </p>
     {{end}}
 </div>
-<input type="checkbox" onclick="toggleAutoRefresh(this);" id="reloadCB"> Auto Follow</input>
-<button type="button" onclick="window.scrollTo(0,0);">Scroll to Top</button>
+<input type="checkbox" onclick="toggleAutoRefresh(this);" id="reloadCB" class="short-button"> Auto Follow</input>
+<button type="button" onclick="window.scrollTo(0,0);" class="short-button">Scroll to Top</button>
 {{template "tail"}}
\ No newline at end of file
diff --git a/tmpl/tasks.tmpl b/tmpl/tasks.tmpl
index ee3edc5..647bca2 100644
--- a/tmpl/tasks.tmpl
+++ b/tmpl/tasks.tmpl
@@ -44,7 +44,7 @@ Total: {{.Stats.TotalCount}}
 
 <h2>Tasks</h2>
 <label for="limit">Limit:</label>
-<select id="limit" name="limit" onchange="setLimit(this.value)">
+<select id="limit" name="limit" onchange="setLimit(this.value)" class="short-button">
     <option selected value="{{.Limit}}">{{.Limit}}</option>
     {{if ne .Limit 100 }}<option value="100">100</option>{{end}}
     {{if ne .Limit 500 }}<option value="500">500</option>{{end}}
@@ -92,8 +92,10 @@ Total: {{.Stats.TotalCount}}
     </tr>
     {{end}}
 </table>
-{{if ne .Page 0 }}<button type="button" onclick="setPage(0)">First Page</button>{{end}}
-{{if ne .Page 0 }}<button type="button" onclick="setPage({{.Page}} -1)">Previous Page</button>{{end}}
-Page {{.Page}}
-{{if ne .Count 0}}<button type="button" onclick="setPage({{.Page}} +1)">Next Page</button>{{end}}
+<div class="button-list">
+    {{if ne .Page 0 }}{{if ne .Page 1 }}<button type="button" onclick="setPage(0)" class="short-button">First Page</button>{{end}}{{end}}
+    {{if ne .Page 0 }}<button type="button" onclick="setPage({{.Page}} -1)" class="short-button">Previous Page</button>{{end}}
+    <div> Page {{.Page}} </div>
+    {{if ne .Count 0}}<button type="button" onclick="setPage({{.Page}} +1)" class="short-button">Next Page</button>{{end}}
+    </div>
 {{template "tail"}}
\ No newline at end of file