diff --git a/project.clj b/project.clj
index 9bb5e3a..adb8569 100644
--- a/project.clj
+++ b/project.clj
@@ -1,7 +1,7 @@
-(defproject caribou/caribou-admin "0.13.3"
+(defproject caribou/caribou-admin "0.13.8"
   :description "Generic admin tool for Caribou projects"
   :dependencies [[org.clojure/clojure "1.5.1"]
-                 [caribou/caribou-frontend "0.13.3"]
+                 [caribou/caribou-frontend "0.13.8"]
                  [clj-time "0.4.4"]]
   :jvm-opts ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n"
              "-Djava.awt.headless=true"
diff --git a/resources/public/_admin/css/timepicker.css b/resources/public/_admin/css/timepicker.css
index b3d76ae..79691b4 100644
--- a/resources/public/_admin/css/timepicker.css
+++ b/resources/public/_admin/css/timepicker.css
@@ -1,30 +1,30 @@
 
-div.time-picker {
+div.ui-timepicker-wrapper {
   position: absolute;
   height: 191px;
-  width:4em; /* needed for IE */
+  width:7em; /* needed for IE */
   overflow: auto;
   background: #fff;
   border: 1px solid #aaa;
   z-index: 99;
   margin: 0;
 }
-div.time-picker-12hours {
+div.ui-timepicker-wrapper-12hours {
   width:6em; /* needed for IE */
 }
 
-div.time-picker ul {
+div.ui-timepicker-wrapper ul {
   list-style-type: none;
   margin: 0;
   padding: 0;
 }
-div.time-picker li {
+div.ui-timepicker-wrapper li {
   cursor: pointer;
   height: 10px;
   font: 12px/1 Helvetica, Arial, sans-serif;
   padding: 4px 3px;
 }
-div.time-picker li.selected {
+div.ui-timepicker-wrapper li.ui-timepicker-selected {
   background: #0063CE;
   color: #fff;
 }
diff --git a/resources/public/_admin/js/modules/pages/content/editors/fields.js b/resources/public/_admin/js/modules/pages/content/editors/fields.js
index eb82da4..7fa510f 100644
--- a/resources/public/_admin/js/modules/pages/content/editors/fields.js
+++ b/resources/public/_admin/js/modules/pages/content/editors/fields.js
@@ -40,6 +40,7 @@
       if ( !this.field.format || this.field.format === "time" || this.field.format === "datetime" ) {
         $( this.parent.selector + " input[name=" + this.field.slug + "-time]" ).show().timepicker({
           //show24Hours: false,
+          timeFormat: 'H:i',
           step: 15
         });
       }
diff --git a/src/caribou/admin/controllers/content/models.clj b/src/caribou/admin/controllers/content/models.clj
index 8066abe..30d9b4a 100644
--- a/src/caribou/admin/controllers/content/models.clj
+++ b/src/caribou/admin/controllers/content/models.clj
@@ -115,10 +115,12 @@
      (admin-controller/render (merge all-helpers params))))
 
 (defn json-response
-  [data]
-  {:status 200
-   :body (generate-string data {:escape-non-ascii true})
-   :headers {"Content-Type" "application/json"}})
+  ([data]
+     {:status 200
+      :body (generate-string data {:escape-non-ascii true})
+      :headers {"Content-Type" "application/json"}})
+  ([data opts]
+     (merge (json-response data) opts)))
 
 (defn part
   [f col]
@@ -477,11 +479,11 @@
       (log/debug "Reloading model, clearing query cache!")
       (query/clear-queries)
       (model/init))
-    (when-not (or (:test request) ; because of a reset handler npe
+    (if (or (:test request) ; because of a reset handler npe
                   (empty? (set/intersection #{"page" "siphon"}
                                             (set (map :model payload)))))
-      (handler/reset-handler))
-    (json-response results)))
+      (json-response results)
+      (json-response results {:reset-handler true}))))
 
 (defn reorder-all
   [{[role-id permissions] :permissions :as request}]
diff --git a/src/caribou/admin/core.clj b/src/caribou/admin/core.clj
index 11a30df..a4a90dd 100644
--- a/src/caribou/admin/core.clj
+++ b/src/caribou/admin/core.clj
@@ -41,7 +41,9 @@
 
 (defn reload-pages
   []
-  (pages/add-page-routes routes/admin-routes 'caribou.admin.controllers ""))
+  (pages/convert-pages-to-routes 
+   routes/admin-routes 
+   'caribou.admin.controllers ""))
 
 (defn open-page?
   [uri]
@@ -95,6 +97,7 @@
   (let [config (app/environment-config)]
     (caribou/with-caribou config
       (reload-pages)
+      (template/init)
       (hooks/init)
       (def handler
         (-> (handler/handler #'reload-pages)
diff --git a/src/caribou/admin/helpers.clj b/src/caribou/admin/helpers.clj
index ef2328f..4e62f5a 100644
--- a/src/caribou/admin/helpers.clj
+++ b/src/caribou/admin/helpers.clj
@@ -50,10 +50,6 @@
     (.format (java.text.SimpleDateFormat. "HH:mm") date)
     "00:00"))
 
-(defn safe-route-for
-  [slug & args]
-  (pages/route-for slug (pages/select-route slug (apply merge args))))
-
 (defn asset-is-image
   ([asset]
     (.startsWith (or (:content-type asset) "") "image"))
@@ -234,7 +230,6 @@
    :position-of position-of
    :get-in get-in-helper
    :join-model? join-model?
-   :safe-route-for safe-route-for
    :system-field? system-field?
    :locales locales
    :localized-models localized-models