diff --git a/backend/backend.py b/backend/backend.py
index c9c2ed3f..fbd04f1a 100644
--- a/backend/backend.py
+++ b/backend/backend.py
@@ -57,7 +57,7 @@ def _jinja2_filter_datetime(watch_obj, format="%Y-%m-%d %H:%M:%S"):
     if watch_obj['last_checked'] == 0:
         return 'Not yet'
 
-    return datetime.datetime.utcfromtimestamp(int(watch_obj['last_checked'])).strftime(format)
+    return timeago.format(int(watch_obj['last_checked']), time.time())
 
 
 # @app.context_processor
diff --git a/backend/templates/watch-overview.html b/backend/templates/watch-overview.html
index 12d3d048..80f57f8d 100644
--- a/backend/templates/watch-overview.html
+++ b/backend/templates/watch-overview.html
@@ -8,14 +8,13 @@
             <legend>Add new change detection watch</legend>
             <input type="url" placeholder="https://..." name="url"/>
             <input type="text" placeholder="tag" size="10" name="tag"/>
-            <button type="submit" class="pure-button pure-button-primary">Save</button>
+            <button type="submit" class="pure-button pure-button-primary">Watch</button>
         </fieldset>
         <!-- add extra stuff, like do a http POST and send headers -->
         <!-- user/pass r = requests.get('https://api.github.com/user', auth=('user', 'pass')) -->
     </form>
 
-    <!-- make a nice list of tags here to click on -->
-    <i>Note: Times are in UTC for now - todo - JS front end format<br/></i>
+    
     <div id="watch-table-wrapper">
         <table class="pure-table pure-table-striped watch-table">
             <thead>