diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs
index 3f4b67fc9..9c1c21a63 100644
--- a/frontend/src/uxbox/main/ui/auth/login.cljs
+++ b/frontend/src/uxbox/main/ui/auth/login.cljs
@@ -57,9 +57,8 @@
     " the projects will be periodicaly wiped."]])
 
 (mf/defc login-form
-  {:wrap [mf/wrap-reactive]}
   []
-  (let [data (mf/react form-data)
+  (let [data (mf/deref form-data)
         valid? (fm/valid? ::login-form data)]
     [:form {:on-submit #(on-submit % data)}
      [:div.login-content
diff --git a/frontend/src/uxbox/main/ui/settings/profile.cljs b/frontend/src/uxbox/main/ui/settings/profile.cljs
index 8c62a8e84..47e7e0b04 100644
--- a/frontend/src/uxbox/main/ui/settings/profile.cljs
+++ b/frontend/src/uxbox/main/ui/settings/profile.cljs
@@ -67,7 +67,7 @@
 
 ;; --- Profile Form
 (mf/def profile-form
-  :mixins [mf/memo mf/reactive mf/sync-render (fm/clear-mixin st/store :profile)]
+  :mixins [mf/memo mf/reactive (fm/clear-mixin st/store :profile)]
   :render
   (fn [own props]
     (let [data (merge {:language @i18n/locale}
@@ -113,7 +113,6 @@
 ;; --- Profile Photo Form
 
 (mf/defc profile-photo-form
-  {:wrap [mf/wrap-reactive]}
   []
   (letfn [(on-change [event]
             (let [target (dom/get-target event)
@@ -122,7 +121,7 @@
                            (first))]
               (st/emit! (udu/update-photo file))
               (dom/clean-value! target)))]
-    (let [{:keys [photo]} (mf/react profile-ref)
+    (let [{:keys [photo]} (mf/deref profile-ref)
           photo (if (or (str/empty? photo) (nil? photo))
                   "images/avatar.jpg"
                   photo)]
diff --git a/frontend/src/uxbox/main/ui/users.cljs b/frontend/src/uxbox/main/ui/users.cljs
index 0968dbf03..cd0cf3912 100644
--- a/frontend/src/uxbox/main/ui/users.cljs
+++ b/frontend/src/uxbox/main/ui/users.cljs
@@ -49,10 +49,9 @@
       (l/derive st/state)))
 
 (mf/defc user
-  {:wrap [mf/wrap-reactive]}
   [_]
   (let [open (mf/use-state false)
-        profile (mf/react profile-ref)
+        profile (mf/deref profile-ref)
         photo (if (str/empty? (:photo profile ""))
                 "/images/avatar.jpg"
                 (:photo profile))]
diff --git a/frontend/src/uxbox/main/ui/workspace.cljs b/frontend/src/uxbox/main/ui/workspace.cljs
index d1e2d08d1..18a0ee150 100644
--- a/frontend/src/uxbox/main/ui/workspace.cljs
+++ b/frontend/src/uxbox/main/ui/workspace.cljs
@@ -83,8 +83,8 @@
                  :no-tool-bar-left (not left-sidebar?)
                  :scrolling (:viewport-positionig workspace))]
 
-    (mf/use-effect {:deps #js [canvas page]
-                    :fn #(subscribe canvas page)})
+    (mf/use-effect #(subscribe canvas page)
+                   #js [(:id page)])
     [:*
      (messages-widget)
      [:& header {:page page
diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs
index 4d9d44278..216e56cd4 100644
--- a/frontend/src/uxbox/main/ui/workspace/header.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/header.cljs
@@ -29,9 +29,8 @@
 ;; --- Zoom Widget
 
 (mf/defc zoom-widget
-  {:wrap [mf/wrap-reactive]}
   [props]
-  (let [zoom (mf/react refs/selected-zoom)
+  (let [zoom (mf/deref refs/selected-zoom)
         increase #(st/emit! (dw/increase-zoom))
         decrease #(st/emit! (dw/decrease-zoom))]
     [:ul.options-view
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
index 5a274c024..a23a434a9 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs
@@ -12,7 +12,6 @@
    [uxbox.builtins.icons :as i]
    [uxbox.main.data.icons :as udi]
    [uxbox.main.data.workspace :as dw]
-   [uxbox.main.lenses :as ul]
    [uxbox.main.store :as st]
    [uxbox.main.ui.dashboard.icons :as icons]
    [uxbox.main.ui.shapes.icon :as icon]
@@ -22,12 +21,12 @@
 
 ;; --- Refs
 
-(def ^:private drawing-shape-ref
-  "A focused vision of the drawing property
-  of the workspace status. This avoids
-  rerender the whole toolbox on each workspace
-  change."
-  (l/derive ul/selected-drawing st/state))
+;; (def ^:private drawing-shape-ref
+;;   "A focused vision of the drawing property
+;;   of the workspace status. This avoids
+;;   rerender the whole toolbox on each workspace
+;;   change."
+;;   (l/derive ul/selected-drawing st/state))
 
 (def ^:private icons-toolbox-ref
   (-> (l/in [:workspace :icons-toolbox])
diff --git a/frontend/src/uxbox/view/ui.cljs b/frontend/src/uxbox/view/ui.cljs
index 580719f39..261903f5c 100644
--- a/frontend/src/uxbox/view/ui.cljs
+++ b/frontend/src/uxbox/view/ui.cljs
@@ -56,9 +56,8 @@
       (l/derive st/state)))
 
 (mf/defc app
-  {:wrap [mf/wrap-reactive]}
   []
-  (let [route (mf/react route-ref)]
+  (let [route (mf/deref route-ref)]
     (case (get-in route [:data :name])
       :view/notfound (notfound-page)
       :view/viewer (let [{:keys [token id]} (get-in route [:params :path])]
diff --git a/frontend/src/uxbox/view/ui/viewer.cljs b/frontend/src/uxbox/view/ui/viewer.cljs
index 76704a645..57e395095 100644
--- a/frontend/src/uxbox/view/ui/viewer.cljs
+++ b/frontend/src/uxbox/view/ui/viewer.cljs
@@ -34,9 +34,8 @@
 ;; --- Component
 
 (mf/defc viewer-page
-  {:wrap [mf/wrap-reactive]}
   [{:keys [token id]}]
-  (let [{:keys [project pages flags]} (mf/react state-ref)]
+  (let [{:keys [project pages flags]} (mf/deref state-ref)]
     (mf/use-effect
      {:fn #(st/emit! (dv/initialize token))})
     (when (seq pages)