diff --git a/frontend/src/uxbox/main/refs.cljs b/frontend/src/uxbox/main/refs.cljs
index c62a97237..6baef2809 100644
--- a/frontend/src/uxbox/main/refs.cljs
+++ b/frontend/src/uxbox/main/refs.cljs
@@ -108,12 +108,9 @@
 
 (defn alignment-activated?
   [state]
-  (let [{:keys [page flags]} (:workspace state)
-        metadata (->> (get-in state [:pages page :metadata])
-                      (merge c/page-metadata))]
+  (let [{:keys [flags]} (:workspace state)]
     (and (contains? flags :grid-indexed)
-         (contains? flags :grid)
-         (:grid-alignment metadata))))
+         (contains? flags :grid-snap))))
 
 (def selected-alignment
   (-> (l/lens alignment-activated?)
diff --git a/frontend/src/uxbox/main/ui/workspace/header.cljs b/frontend/src/uxbox/main/ui/workspace/header.cljs
index e53e559f5..992a55f88 100644
--- a/frontend/src/uxbox/main/ui/workspace/header.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/header.cljs
@@ -134,8 +134,8 @@
         i/grid]
        [:li.tooltip.tooltip-bottom
         {:alt "Snap to grid"
-         :class (when (contains? flags :grid) "selected")
-         :on-click (partial toggle :grid)}
+         :class (when (contains? flags :grid-snap) "selected")
+         :on-click (partial toggle :grid-snap)}
         i/grid-snap]]
        ;; [:li.tooltip.tooltip-bottom
         ;; {:alt "Align (Ctrl + A)"}
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
index 1577d19d5..502f05be1 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/page.cljs
@@ -124,10 +124,6 @@
                 (->> (assoc metadata :grid-color value)
                      (udp/update-metadata id)
                      (st/emit!))))
-            (on-magnet-change []
-              (let [checked? (dom/checked? (mx/ref-node own "magnet"))
-                    metadata (assoc metadata :grid-alignment checked?)]
-                (st/emit! (udw/update-metadata id metadata))))
             (show-color-picker [event]
               (let [x (.-clientX event)
                     y (.-clientY event)
@@ -164,15 +160,4 @@
           [:input
            {:on-change on-color-change
             :ref "color"
-            :value (:grid-color metadata "#cccccc")}]]]
-
-        [:span "Magnet option"]
-        [:div.row-flex
-         [:div.input-checkbox.check-primary
-          [:input
-           {:type "checkbox"
-            :ref "magnet"
-            :id "magnet"
-            :on-change on-magnet-change
-            :checked (when (:grid-alignment metadata) "checked")}]
-          [:label {:for "magnet"} "Activate magnet"]]]]])))
+            :value (:grid-color metadata "#cccccc")}]]]]])))