diff --git a/templates/content/clients.php b/templates/content/clients.php
index d4687f7..e0f12ac 100644
--- a/templates/content/clients.php
+++ b/templates/content/clients.php
@@ -1,28 +1,28 @@
 <div id="timetracker-clients">
-<h1 class='page-title'>Clients</h1>
-<div id="client-input-container" class='center'>
+    <h1 class='page-title'>Clients</h1>
+    <div id="client-input-container" class='center'>
         <form>
             <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="New client name..." id="new-client-input">
             <input type="submit" value="Add client" id="new-client-submit" class="ui-button primary">
         </form>
-</div>
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this client?
-</div>
-<div id="dialog-client-edit-form" title="Edit client" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
-<div id="clients">
-</div>
+    </div>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this client?
+    </div>
+    <div id="dialog-client-edit-form" title="Edit client" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
+        <form>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+    <div id="clients">
+    </div>
 </div>
\ No newline at end of file
diff --git a/templates/content/dashboard.php b/templates/content/dashboard.php
index a8fd72e..ac5462c 100644
--- a/templates/content/dashboard.php
+++ b/templates/content/dashboard.php
@@ -1,22 +1,21 @@
-
 <div id="timetracker-dashboard" class='theme-white'>
-<h1 class='page-title'>Dashboard</h1>
+    <h1 class='page-title'>Dashboard</h1>
 
 
-<div class="clearfix"> </div>
-<div id="dashboard">
-  <div>
-    <h1>Time (in minutes) allocated to each client in the last days</h1>
     <div class="clearfix"> </div>
-  <br/>
-  <div class="time-controls">
-    <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-        <i class="fa fa-calendar"></i>&nbsp;
-        <span></span> <i class="fa fa-caret-down"></i>
+    <div id="dashboard">
+        <div>
+            <h1>Time (in minutes) allocated to each client in the last days</h1>
+            <div class="clearfix"> </div>
+            <br />
+            <div class="time-controls">
+                <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+                    <i class="fa fa-calendar"></i>&nbsp;
+                    <span></span> <i class="fa fa-caret-down"></i>
+                </div>
+            </div>
+            <canvas id="myChart" width="400" height="400"></canvas>
+            <div id='summary'></div>
+        </div>
     </div>
-  </div>
-<canvas id="myChart" width="400" height="400"></canvas>
-<div id='summary'></div>
-  </div>
-</div>
 </div>
\ No newline at end of file
diff --git a/templates/content/goals.php b/templates/content/goals.php
index d1a5cac..b0f4159 100644
--- a/templates/content/goals.php
+++ b/templates/content/goals.php
@@ -1,26 +1,26 @@
 <div id="timetracker-goals">
-<h1 class='page-title'>Goals</h1>
-<div id="client-input-container" class='center'>
+    <h1 class='page-title'>Goals</h1>
+    <div id="client-input-container" class='center'>
         <form>
-        <label for="project-select">
-          Project
-          <select id="project-select" style="width: 200px;">
-          </select>
-        </label>
+            <label for="project-select">
+                Project
+                <select id="project-select" style="width: 200px;">
+                </select>
+            </label>
             <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="# hours" id="new-goal-hours">
             <label for="new-goal-interval">
-              <select id="new-goal-interval" style="width: 200px;">
-                  <option value="Weekly">Weekly</option>  
-                  <option value="Monthly">Monthly</option>
-              </select>
-          </label>
-            <input type="submit" value="Add goal" id="new-goal-submit"  class='ui-button primary'>
+                <select id="new-goal-interval" style="width: 200px;">
+                    <option value="Weekly">Weekly</option>
+                    <option value="Monthly">Monthly</option>
+                </select>
+            </label>
+            <input type="submit" value="Add goal" id="new-goal-submit" class='ui-button primary'>
         </form>
-</div>
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this goal?
-</div>
-<div class="clearfix"> </div>
-<div id="goals">
-</div>
-</div>
+    </div>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this goal?
+    </div>
+    <div class="clearfix"> </div>
+    <div id="goals">
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/content/index.php b/templates/content/index.php
index c5b5f2b..bf1655e 100644
--- a/templates/content/index.php
+++ b/templates/content/index.php
@@ -1,71 +1,69 @@
 <div id="timetracker-content">
-<div id="top-work-bar">
-    <div id="work-input-container">
+    <div id="top-work-bar">
+        <div id="work-input-container">
+            <form>
+                <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="What have you done?" id="work-input">
+            </form>
+        </div>
+        <div id="top-work-bar-right">
+            <div id="timer"></div>
+            <button id="start-tracking" class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Start">
+                <span class="my-icon play-button"></span>
+            </button>
+        </div>
+
+    </div>
+    <div class="ui-button ui-widget ui-corner-all" id="manual-entry-button">Manual entry</div>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this work item?
+    </div>
+    <div id="dialog-work-item-edit-form" title="Edit work item" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
         <form>
-            <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="What have you done?" id="work-input">
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+                <div class="clear"></div>
+                <label for="details">Details</label>
+                <textarea style='vertical-align: middle;width:300px;' name="details" id="details" cols="40" rows="5" value="" id="details" class="text ui-widget-content ui-corner-all"></textarea>
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
         </form>
     </div>
-    <div id="top-work-bar-right">
-    <!-- <input type="text" id="datepicker-from">
-    <input type="text" id="datepicker-to"> -->
-    <div id="timer"></div>
-    <button id="start-tracking" class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Start">
-        <span class="my-icon play-button"></span>
-    </button>
-    </div>
 
-</div>
-<div class="ui-button ui-widget ui-corner-all" id="manual-entry-button">Manual entry</div>
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this work item?
-</div>
-<div id="dialog-work-item-edit-form" title="Edit work item" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset >
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
-      <div class="clear"></div>
-      <label for="details">Details</label>
-      <textarea  style='vertical-align: middle;width:300px;' name="details" id="details" cols="40" rows="5" value="" id="details" class="text ui-widget-content ui-corner-all"></textarea>
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
+    <div id="dialog-manual-entry" title="Add work item" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
 
-<div id="dialog-manual-entry" title="Add work item" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form id='form-manual-entry'>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name-manual-entry" value="" class="text ui-widget-content ui-corner-all">
-      <div class="clear"></div>
-      <label for="details">Details</label>
-      <textarea  style='vertical-align: middle;width:250px;' name="details" cols="40" rows="5" value="" id="details-manual-entry" class="text ui-widget-content ui-corner-all"></textarea>
-      <!-- <div id='hours-manual-entry'>&nbsp;</div> -->
-      <label for="hours">Interval</label>
-      <input type="text" name="hours" id="hours-manual-entry" value="" class="text ui-widget-content ui-corner-all">
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
+        <form id='form-manual-entry'>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name-manual-entry" value="" class="text ui-widget-content ui-corner-all">
+                <div class="clear"></div>
+                <label for="details">Details</label>
+                <textarea style='vertical-align: middle;width:250px;' name="details" cols="40" rows="5" value="" id="details-manual-entry" class="text ui-widget-content ui-corner-all"></textarea>
+                <!-- <div id='hours-manual-entry'>&nbsp;</div> -->
+                <label for="hours">Interval</label>
+                <input type="text" name="hours" id="hours-manual-entry" value="" class="text ui-widget-content ui-corner-all">
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
 
-<div class="clearfix"> </div>
-<br/>
-<div class="time-controls">
-  <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-      <i class="fa fa-calendar"></i>&nbsp;
-      <span></span> <i class="fa fa-caret-down"></i>
-  </div>
-</div>
-<br/>
+    <div class="clearfix"> </div>
+    <br />
+    <div class="time-controls">
+        <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+            <i class="fa fa-calendar"></i>&nbsp;
+            <span></span> <i class="fa fa-caret-down"></i>
+        </div>
+    </div>
+    <br />
 
-<div class="clearfix"> </div>
-<div id="work-intervals">
-</div>
-</div>
+    <div class="clearfix"> </div>
+    <div id="work-intervals">
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/content/projects.php b/templates/content/projects.php
index a807c8f..4569291 100644
--- a/templates/content/projects.php
+++ b/templates/content/projects.php
@@ -1,76 +1,81 @@
-
 <div id="timetracker-projects" class='theme-white'>
-<h1 class='page-title'>Projects</h1>
-<div id="client-input-container" class='center'>
+    <h1 class='page-title'>Projects</h1>
+    <div id="client-input-container" class='center'>
         <form>
             <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="New project name..." id="new-project-input">
             <select class="form-control" id="client-select"></select>
             <input tabindex="2" type="text" spellcheck="false" autocomplete="off" class="hidden" id="new-project-color">
             <div class="picker-wrapper">
-              <button class="btn" onclick="return false;">Select a color</button>
-              <div class="color-picker" id='color-picker-project-new'>
-              </div>
+                <button class="btn" onclick="return false;">Select a color</button>
+                <div class="color-picker" id='color-picker-project-new'>
+                </div>
             </div>
-            
+
             <input type="submit" value="Add project" id="new-project-submit" class='ui-button primary'>
         </form>
-</div>
-<div id="project-filter-container" class='left'>
-        
+    </div>
+    <div id="project-filter-container" class='left'>
+
         <div class="checkbox">
-          <label>
-            <input id='show-archived-projects' type="checkbox" value="">
-            Show archived projects
-          </label>
-        </div>
-        
-</div>
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this project?
-</div>
-<div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <div>
-        <label for="name">Name</label>
-        <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
-      </div>
-      <div>
-        <label for="name">Color</label>
-        <input type="text" name="color" id="project-edit-color" value="" class="text ui-widget-content ui-corner-all hidden">
-        <div class="picker-wrapper-project-edit">
-              <button class="btn" onclick="return false;">Select a color</button>
-              <div class="color-picker" id='color-picker-project-edit'>
-              </div>
+            <label>
+                <input id='show-archived-projects' type="checkbox" value="">
+                Show archived projects
+            </label>
         </div>
-      </div>
-      <div class='hidden admin-only' id='locked-div'>
-        <label for="locked">Locked</label>
-        <input type="checkbox" name="locked" id="locked" value="" class="text ui-widget-content ui-corner-all">
-      </div>
-      <div class='' id='archived-div'>
-        <label for="archived">Archived</label>
-        <input type="checkbox" name="archived" id="archived" value="" class="text ui-widget-content ui-corner-all">
-      </div>
-      <div class='hidden' id='locked-options'>
-      <label for="locked-select-tags">Allowed Tags</label>
-        <select class="form-control" id="locked-select-tags" multiple="multiple"><option></option></select>
-        <label for="locked-select-users">Users</label>
-        <select class="form-control" id="locked-select-users" multiple="multiple"><option></option></select>
-      </div>
-      <div>
-      <label for="client-select-popup">Client</label>
-      <select class="form-control" id="client-select-popup"><option></option></select>
-      </div>
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" id="edit-name-submit" tabindex="-1" style="position:absolute; top:-1000px" class='ui-button primary'>
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
 
-<div id="projects">
-</div>
+    </div>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this project?
+    </div>
+    <div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
+        <form>
+            <fieldset>
+                <div>
+                    <label for="name">Name</label>
+                    <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+                </div>
+                <div>
+                    <label for="name">Color</label>
+                    <input type="text" name="color" id="project-edit-color" value="" class="text ui-widget-content ui-corner-all hidden">
+                    <div class="picker-wrapper-project-edit">
+                        <button class="btn" onclick="return false;">Select a color</button>
+                        <div class="color-picker" id='color-picker-project-edit'>
+                        </div>
+                    </div>
+                </div>
+                <div class='hidden admin-only' id='locked-div'>
+                    <label for="locked">Locked</label>
+                    <input type="checkbox" name="locked" id="locked" value="" class="text ui-widget-content ui-corner-all">
+                </div>
+                <div class='' id='archived-div'>
+                    <label for="archived">Archived</label>
+                    <input type="checkbox" name="archived" id="archived" value="" class="text ui-widget-content ui-corner-all">
+                </div>
+                <div class='hidden' id='locked-options'>
+                    <label for="locked-select-tags">Allowed Tags</label>
+                    <select class="form-control" id="locked-select-tags" multiple="multiple">
+                        <option></option>
+                    </select>
+                    <label for="locked-select-users">Users</label>
+                    <select class="form-control" id="locked-select-users" multiple="multiple">
+                        <option></option>
+                    </select>
+                </div>
+                <div>
+                    <label for="client-select-popup">Client</label>
+                    <select class="form-control" id="client-select-popup">
+                        <option></option>
+                    </select>
+                </div>
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" id="edit-name-submit" tabindex="-1" style="position:absolute; top:-1000px" class='ui-button primary'>
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+
+    <div id="projects">
+    </div>
 </div>
\ No newline at end of file
diff --git a/templates/content/reports.php b/templates/content/reports.php
index 8dd0c47..f4005a9 100644
--- a/templates/content/reports.php
+++ b/templates/content/reports.php
@@ -1,80 +1,79 @@
-
 <div id="timetracker-projects" class='theme-white'>
-<h1 class='page-title'>Reports</h1>
+    <h1 class='page-title'>Reports</h1>
+
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this report?
+    </div>
+    <div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
 
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this report?
-</div>
-<div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
-<br/>
-<div class="time-controls">
-  <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-      <i class="fa fa-calendar"></i>&nbsp;
-      <span></span> <i class="fa fa-caret-down"></i>
-  </div>
-</div>
-<br/>
-<div class="group-controls">
-  <label for="group1">
-    Group by
-      <select id="group1" style="width: 200px;">
-          <option value="">None</option>
-          <option value="project" selected>Project</option>
-          <option value="userUid">User</option>
-          <option value="client">Client</option>
-      </select>
-  </label>
-  <label for="group2">
-    and by
-      <select id="group2" style="width: 200px;">
-          <option value="">None</option>  
-          <option value="name">Time Entry</option>
-          <option value="userUid" selected>User</option>
-          <option value="project">Project</option>
-      </select>
-  </label>
-      <select id="group3" style="width: 200px;">
-        <option value="">None</option>
-          <option value="day" selected>Daily</option>
-          <option value="week">Weekly</option>
-          <option value="month">Monthly</option>
-          <option value="year">Yearly</option>
-      </select>
+        <form>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+    <br />
+    <div class="time-controls">
+        <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+            <i class="fa fa-calendar"></i>&nbsp;
+            <span></span> <i class="fa fa-caret-down"></i>
+        </div>
+    </div>
+    <br />
+    <div class="group-controls">
+        <label for="group1">
+            Group by
+            <select id="group1" style="width: 200px;">
+                <option value="">None</option>
+                <option value="project" selected>Project</option>
+                <option value="userUid">User</option>
+                <option value="client">Client</option>
+            </select>
+        </label>
+        <label for="group2">
+            and by
+            <select id="group2" style="width: 200px;">
+                <option value="">None</option>
+                <option value="name">Time Entry</option>
+                <option value="userUid" selected>User</option>
+                <option value="project">Project</option>
+            </select>
+        </label>
+        <select id="group3" style="width: 200px;">
+            <option value="">None</option>
+            <option value="day" selected>Daily</option>
+            <option value="week">Weekly</option>
+            <option value="month">Monthly</option>
+            <option value="year">Yearly</option>
+        </select>
         <!--<button id="download-xlsx">Download XLSX</button>
         <button id="download-pdf">Download PDF</button> -->
-</div>
-<div class="filter-controls">
-  <label for="filter-project">
-      Filter projects
-    <select id="filter-project" style="width: 200px;">
-    </select>
-  </label>
-  <label for="filter-client">
-      Filter clients
-    <select id="filter-client" style="width: 200px;">
-    </select>
-  </label>
-</div>
-<div class="table-controls">
-      <button id="download-csv">Download CSV</button>
-      <button id="download-json">Download JSON</button>
-      <!--<button id="download-xlsx">Download XLSX</button>
+    </div>
+    <div class="filter-controls">
+        <label for="filter-project">
+            Filter projects
+            <select id="filter-project" style="width: 200px;">
+            </select>
+        </label>
+        <label for="filter-client">
+            Filter clients
+            <select id="filter-client" style="width: 200px;">
+            </select>
+        </label>
+    </div>
+    <div class="table-controls">
+        <button id="download-csv">Download CSV</button>
+        <button id="download-json">Download JSON</button>
+        <!--<button id="download-xlsx">Download XLSX</button>
       <button id="download-pdf">Download PDF</button> -->
-</div>
+    </div>
 
-<div id="report">
-</div>
-</div>
+    <div id="report">
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/content/tags.php b/templates/content/tags.php
index 5fcf6df..10e6823 100644
--- a/templates/content/tags.php
+++ b/templates/content/tags.php
@@ -1,28 +1,28 @@
 <div id="timetracker-tags">
-<h1 class='page-title'>Tags</h1>
-<div id="client-input-container" class='center'>
+    <h1 class='page-title'>Tags</h1>
+    <div id="client-input-container" class='center'>
         <form>
             <input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="New tag name..." id="new-tag-input">
-            <input type="submit" value="Add tag" id="new-tag-submit"  class='ui-button primary'>
+            <input type="submit" value="Add tag" id="new-tag-submit" class='ui-button primary'>
         </form>
-</div>
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this tag?
-</div>
-<div id="dialog-tag-edit-form" title="Edit tag" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
-<div id="tags">
-</div>
+    </div>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this tag?
+    </div>
+    <div id="dialog-tag-edit-form" title="Edit tag" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
+        <form>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+    <div id="tags">
+    </div>
 </div>
\ No newline at end of file
diff --git a/templates/content/timelines-admin.php b/templates/content/timelines-admin.php
index 625d618..e16f4ca 100644
--- a/templates/content/timelines-admin.php
+++ b/templates/content/timelines-admin.php
@@ -1,44 +1,43 @@
-
 <div id="timetracker-projects" class='theme-white'>
-<h1 class='page-title'>Timelines Admin</h1>
+    <h1 class='page-title'>Timelines Admin</h1>
+
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this timeline?
+    </div>
+    <div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
+        <form>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+    <br />
+    <div id="dialog-timeline-edit-form" title="Edit Timeline" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
 
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this timeline?
-</div>
-<div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
-<br/>
-<div id="dialog-timeline-edit-form" title="Edit Timeline" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <div>
-        <label for="status">Status</label>
-        <select name="status" id="status">
-        <option value="pending">Pending</option>
-        <option value="approved">Approved</option>
-        <option value="rejected">Rejected</option>
-        </select>
-      </div>
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" id="edit-name-submit" tabindex="-1" style="position:absolute; top:-1000px" class='ui-button primary'>
-    </fieldset>
-  </form>
-</div>
+        <form>
+            <fieldset>
+                <div>
+                    <label for="status">Status</label>
+                    <select name="status" id="status">
+                        <option value="pending">Pending</option>
+                        <option value="approved">Approved</option>
+                        <option value="rejected">Rejected</option>
+                    </select>
+                </div>
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" id="edit-name-submit" tabindex="-1" style="position:absolute; top:-1000px" class='ui-button primary'>
+            </fieldset>
+        </form>
+    </div>
 
-<div id="timelines">
-</div>
-</div>
+    <div id="timelines">
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/content/timelines.php b/templates/content/timelines.php
index 7d68bb8..70c5a8f 100644
--- a/templates/content/timelines.php
+++ b/templates/content/timelines.php
@@ -1,102 +1,102 @@
 <div id="timetracker-projects" class='theme-white'>
-<h1 class='page-title'>Timelines</h1>
+    <h1 class='page-title'>Timelines</h1>
 
-<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
-  Are you sure you want to delete this timeline?
-</div>
-<div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
-  <p class="validateTips">All form fields are required.</p>
- 
-  <form>
-    <fieldset>
-      <label for="name">Name</label>
-      <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div id="dialog-send-email-form" title="Send timeline to email" class='hidden'>
-  <p class="validateTips">All form fields are required. Please make sure that your email settings are correct in your Nextcloud configuration.</p>
- <br/>
-  <form>
-    <fieldset>
-      <label for="email">Destination Email addresses (; separated):</label>
-      <div class="clearfix"> </div>
-      <input type="text" name="email" id="email-address" value="" class="text ui-widget-content ui-corner-all" style="width:250px;">
-      <div class="clearfix"> </div>
-      <label for="subject">Subject:</label>
-      <div class="clearfix"> </div>
-      <input type="text" name="subject" id="email-subject" value="" placehoder="Subject line" style="width:250px;" class="text ui-widget-content ui-corner-all">
-      <div class="clearfix"> </div>
-      <label for="content">Email Content:</label>
-      <div class="clearfix"> </div>
-      <textarea id="email-content" name="content" rows="4" cols="50" class="text ui-widget-content ui-corner-all" style="width:250px;"></textarea>
-      
- 
-      <!-- Allow form submission with keyboard without duplicating the dialog button -->
-      <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
-    </fieldset>
-  </form>
-</div>
-<div class="clearfix"> </div>
-<br/>
-<div class="time-controls">
-  <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
-      <i class="fa fa-calendar"></i>&nbsp;
-      <span></span> <i class="fa fa-caret-down"></i>
-  </div>
-</div>
-<br/>
-<div class="group-controls">
-  <label for="group1">
-    Group by
-      <select id="group1" style="width: 200px;">>
-          <option value="project">Project</option>
-          <option value="client">Client</option>
-      </select>
-  </label>
-  <label for="group2">
-    and by
-      <select id="group2" style="width: 200px;">
-          <option value="">None</option>  
-          <option value="name">Time Entry</option>
-      </select>
-  </label>
-      <select id="group3" style="width: 200px;">
-          <option value="day">Daily</option>
-          <option value="week">Weekly</option>
-          <option value="month">Monthly</option>
-          <option value="year">Yearly</option>
-      </select>
+    <div id="dialog-confirm" title="Confirmation Required" class='hidden'>
+        Are you sure you want to delete this timeline?
+    </div>
+    <div id="dialog-project-edit-form" title="Edit Project" class='hidden'>
+        <p class="validateTips">All form fields are required.</p>
+
+        <form>
+            <fieldset>
+                <label for="name">Name</label>
+                <input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div id="dialog-send-email-form" title="Send timeline to email" class='hidden'>
+        <p class="validateTips">All form fields are required. Please make sure that your email settings are correct in your Nextcloud configuration.</p>
+        <br />
+        <form>
+            <fieldset>
+                <label for="email">Destination Email addresses (; separated):</label>
+                <div class="clearfix"> </div>
+                <input type="text" name="email" id="email-address" value="" class="text ui-widget-content ui-corner-all" style="width:250px;">
+                <div class="clearfix"> </div>
+                <label for="subject">Subject:</label>
+                <div class="clearfix"> </div>
+                <input type="text" name="subject" id="email-subject" value="" placehoder="Subject line" style="width:250px;" class="text ui-widget-content ui-corner-all">
+                <div class="clearfix"> </div>
+                <label for="content">Email Content:</label>
+                <div class="clearfix"> </div>
+                <textarea id="email-content" name="content" rows="4" cols="50" class="text ui-widget-content ui-corner-all" style="width:250px;"></textarea>
+
+
+                <!-- Allow form submission with keyboard without duplicating the dialog button -->
+                <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+            </fieldset>
+        </form>
+    </div>
+    <div class="clearfix"> </div>
+    <br />
+    <div class="time-controls">
+        <div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
+            <i class="fa fa-calendar"></i>&nbsp;
+            <span></span> <i class="fa fa-caret-down"></i>
+        </div>
+    </div>
+    <br />
+    <div class="group-controls">
+        <label for="group1">
+            Group by
+            <select id="group1" style="width: 200px;">>
+                <option value="project">Project</option>
+                <option value="client">Client</option>
+            </select>
+        </label>
+        <label for="group2">
+            and by
+            <select id="group2" style="width: 200px;">
+                <option value="">None</option>
+                <option value="name">Time Entry</option>
+            </select>
+        </label>
+        <select id="group3" style="width: 200px;">
+            <option value="day">Daily</option>
+            <option value="week">Weekly</option>
+            <option value="month">Monthly</option>
+            <option value="year">Yearly</option>
+        </select>
         <!--<button id="download-xlsx">Download XLSX</button>
         <button id="download-pdf">Download PDF</button> -->
-</div>
-<div class="filter-controls">
-  <label for="filter-project">
-      Filter projects
-    <select id="filter-project" style="width: 200px;">
-    </select>
-  </label>
-  <label for="filter-client">
-      Filter clients
-    <select id="filter-client" style="width: 200px;">
-    </select>
-  </label>
-</div>
-<div class="table-controls">
-      <button id="timeline-csv">Export Timeline CSV</button>
-      <!-- <button id="download-json">Download JSON</button> -->
-      <!--<button id="download-xlsx">Download XLSX</button> -->
-      <!-- <button id="download-pdf">Download PDF</button> -->
-</div>
+    </div>
+    <div class="filter-controls">
+        <label for="filter-project">
+            Filter projects
+            <select id="filter-project" style="width: 200px;">
+            </select>
+        </label>
+        <label for="filter-client">
+            Filter clients
+            <select id="filter-client" style="width: 200px;">
+            </select>
+        </label>
+    </div>
+    <div class="table-controls">
+        <button id="timeline-csv">Export Timeline CSV</button>
+        <!-- <button id="download-json">Download JSON</button> -->
+        <!--<button id="download-xlsx">Download XLSX</button> -->
+        <!-- <button id="download-pdf">Download PDF</button> -->
+    </div>
 
-<div id="report">
-</div>
-<br/>
-<h1 class='page-title'>Exported Timelines Statuses</h1>
-<br/>
-<div id="timelines">
-</div>
-</div>
+    <div id="report">
+    </div>
+    <br />
+    <h1 class='page-title'>Exported Timelines Statuses</h1>
+    <br />
+    <div id="timelines">
+    </div>
+</div>
\ No newline at end of file