diff --git a/frontend/src/uxbox/main/ui/shapes/circle.cljs b/frontend/src/uxbox/main/ui/shapes/circle.cljs
index 4c5cc6e9e..fc50940e3 100644
--- a/frontend/src/uxbox/main/ui/shapes/circle.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/circle.cljs
@@ -20,10 +20,10 @@
 (declare circle-shape)
 
 (mf/defc circle-component
-  [{:keys [id] :as shape}]
-  (let [modifiers (mf/deref (refs/selected-modifiers id))
+  [{:keys [shape] :as props}]
+  (let [modifiers (mf/deref (refs/selected-modifiers (:id shape)))
         selected (mf/deref refs/selected-shapes)
-        selected? (contains? selected id)
+        selected? (contains? selected (:id shape))
         on-mouse-down #(common/on-mouse-down % shape selected)]
     [:g.shape {:class (when selected? "selected")
                :on-mouse-down on-mouse-down}
diff --git a/frontend/src/uxbox/main/ui/shapes/path.cljs b/frontend/src/uxbox/main/ui/shapes/path.cljs
index 77e03c524..8e2a0117e 100644
--- a/frontend/src/uxbox/main/ui/shapes/path.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/path.cljs
@@ -23,15 +23,15 @@
 (declare path-shape)
 
 (mf/defc path-component
-  [{:keys [id] :as shape}]
-  (let [modifiers (mf/deref (refs/selected-modifiers id))
+  [{:keys [shape] :as props}]
+  (let [modifiers (mf/deref (refs/selected-modifiers (:id shape)))
         selected (mf/deref refs/selected-shapes)
-        selected? (contains? selected id)]
+        selected? (contains? selected (:id shape))]
     (letfn [(on-mouse-down [event]
               (common/on-mouse-down event shape selected))
             (on-double-click [event]
               (when selected?
-                (st/emit! (uds/start-edition-mode id))))]
+                (st/emit! (uds/start-edition-mode (:id shape)))))]
       [:g.shape {:class (when selected? "selected")
                  :on-double-click on-double-click
                  :on-mouse-down on-mouse-down}
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
index 6807f0329..410422631 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/stroke.cljs
@@ -65,7 +65,7 @@
        [:div.color-info
         [:input
          {:on-change on-stroke-color-change
-          :value (:stroke-color shape)}]]]
+          :value (:stroke-color shape "")}]]]
 
       [:span "Radius"]
       [:div.row-flex
diff --git a/manage.sh b/manage.sh
index 0a1f6fe33..2295ce0f6 100755
--- a/manage.sh
+++ b/manage.sh
@@ -247,9 +247,11 @@ case $1 in
     run)
         run
         ;;
+
     log)
         log
         ;;
+
     stop)
         stop
         ;;