diff --git a/common/src/app/common/pages/focus.cljc b/common/src/app/common/pages/focus.cljc
index f4dda2b97..a7ca0f495 100644
--- a/common/src/app/common/pages/focus.cljc
+++ b/common/src/app/common/pages/focus.cljc
@@ -8,7 +8,6 @@
   (:require
    [app.common.data :as d]
    [app.common.pages.helpers :as cph]
-   [app.common.pages.indices :as cpi]
    [app.common.uuid :as uuid]))
 
 (defn focus-objects
diff --git a/common/src/app/common/pages/helpers.cljc b/common/src/app/common/pages/helpers.cljc
index 901b43812..5107be901 100644
--- a/common/src/app/common/pages/helpers.cljc
+++ b/common/src/app/common/pages/helpers.cljc
@@ -18,14 +18,24 @@
 ;; GENERIC SHAPE SELECTORS AND PREDICATES
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn root-frame?
+(defn root?
   [{:keys [id type]}]
-  (and (= type :frame)
-       (= id uuid/zero)))
+  (and (= type :frame) (= id uuid/zero)))
+
+(defn root-frame?
+  ([objects id]
+   (root-frame? (get objects id)))
+
+  ([{:keys [frame-id type]}]
+   (and (= type :frame)
+        (= frame-id uuid/zero))))
 
 (defn frame-shape?
-  [{:keys [type]}]
-  (= type :frame))
+  ([objects id]
+   (frame-shape? (get objects id)))
+
+  ([{:keys [type]}]
+   (= type :frame)))
 
 (defn group-shape?
   [{:keys [type]}]
@@ -230,13 +240,29 @@
       (< parent-a parent-b))))
 
 (defn sort-z-index
-  [objects ids]
-  (letfn [(comp [id-a id-b]
-            (cond
-              (= id-a id-b) 0
-              (is-shape-over-shape? objects id-a id-b) 1
-              :else -1))]
-    (sort comp ids)))
+  ([objects ids]
+   (sort-z-index objects ids nil))
+
+  ([objects ids {:keys [bottom-frames?]}]
+   (letfn [(comp [id-a id-b]
+             (let [type-a (dm/get-in objects [id-a :type])
+                   type-b (dm/get-in objects [id-b :type])]
+               (cond
+                 (and bottom-frames? (= :frame type-a) (not= :frame type-b))
+                 1
+
+                 (and bottom-frames? (not= :frame type-a) (= :frame type-b))
+                 -1
+
+                 (= id-a id-b)
+                 0
+
+                 (is-shape-over-shape? objects id-a id-b)
+                 1
+
+                 :else
+                 -1)))]
+     (sort comp ids))))
 
 (defn frame-id-by-position
   [objects position]
diff --git a/common/src/app/common/pages/indices.cljc b/common/src/app/common/pages/indices.cljc
index 571de3613..f8b85bec0 100644
--- a/common/src/app/common/pages/indices.cljc
+++ b/common/src/app/common/pages/indices.cljc
@@ -8,78 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.pages.helpers :as cph]
-   [app.common.uuid :as uuid]
-   [clojure.set :as set]))
-
-#_(defn calculate-frame-z-index
-  [z-index frame-id base-idx objects]
-
-  (let [is-root-frame?    (fn [id]
-                            (and (= :frame (get-in objects [id :type]))
-                                 (= uuid/zero (get-in objects [id :parent-id]))))
-        children     (or (get-in objects [frame-id :shapes]) [])]
-
-    (if (empty? children)
-      z-index
-      (loop [current (peek children)
-             pending (pop children)
-             current-idx base-idx
-             z-index z-index]
-
-        (let [children  (get-in objects [current :shapes])
-              is-root-frame? (is-root-frame? current)
-              pending   (if (not is-root-frame?)
-                          (d/concat-vec pending children)
-                          pending)]
-
-          (if (empty? pending)
-            (assoc z-index current current-idx)
-            (recur (peek pending)
-                   (pop pending)
-                   (dec current-idx)
-                   (assoc z-index current current-idx))))))))
-
-;; The z-index is really calculated per-frame. Every frame will have its own
-;; internal z-index. To calculate the "final" z-index we add the shape z-index with
-;; the z-index of its frame. This way we can update the z-index per frame without
-;; the need of recalculate all the frames
-#_(defn calculate-z-index
-  "Given a collection of shapes calculates their z-index. Greater index
-  means is displayed over other shapes with less index."
-  [objects]
-
-  (let [frames  (cph/get-root-frames objects)
-
-        by-frame (cph/objects-by-frame objects)
-        frame-base-idx (d/update-vals by-frame count)
-
-        z-index (calculate-frame-z-index {} uuid/zero (get frame-base-idx uuid/zero) objects)]
-    (->> frames
-         (reduce
-          (fn [z-index {:keys [id]}]
-            (calculate-frame-z-index z-index id (get frame-base-idx id) objects)) z-index))))
-
-#_(defn update-z-index
-  "Updates the z-index given a set of ids to change and the old and new objects
-  representations"
-  [z-index changed-ids old-objects new-objects]
-
-  (let [old-frames (into #{} (map #(get-in old-objects [% :frame-id])) changed-ids)
-        new-frames (into #{} (map #(get-in new-objects [% :frame-id])) changed-ids)
-
-        changed-frames (set/union old-frames new-frames)
-
-        frames (->> (cph/get-frames new-objects)
-                    (map :id)
-                    (filter #(contains? changed-frames %)))
-
-        by-frame       (cph/objects-by-frame new-objects)
-        frame-base-idx (d/update-vals by-frame count)
-        z-index (calculate-frame-z-index z-index uuid/zero (get frame-base-idx uuid/zero) new-objects)]
-
-    (->> frames
-         (reduce (fn [z-index id]
-                   (calculate-frame-z-index z-index id (get frame-base-idx id) new-objects)) z-index))))
+   [app.common.uuid :as uuid]))
 
 (defn generate-child-parent-index
   [objects]
@@ -104,11 +33,16 @@
   "Retrieves the mask information for an object"
   [objects parents-index]
   (let [retrieve-clips
-        (fn [_ parents]
+        (fn [parents]
           (let [lookup-object (fn [id] (get objects id))
                 get-clip-parents
                 (fn [shape]
                   (cond-> []
+                    (and (= :frame (:type shape))
+                         (not (:show-content shape))
+                         (not= uuid/zero (:id shape)))
+                    (conj shape)
+
                     (:masked-group? shape)
                     (conj (get objects (->> shape :shapes first)))
 
@@ -119,5 +53,5 @@
                   (comp (map lookup-object)
                         (mapcat get-clip-parents))
                   parents)))]
-    (->> parents-index
-         (d/mapm retrieve-clips))))
+    (-> parents-index
+        (d/update-vals retrieve-clips))))
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index ef20955e1..9f8f9deb5 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -6,8 +6,6 @@
 
 (ns app.main.data.workspace
   (:require
-   [app.main.data.workspace.indices :as dwidx]
-   
    [app.common.attrs :as attrs]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
@@ -34,6 +32,7 @@
    [app.main.data.workspace.fix-bool-contents :as fbc]
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.guides :as dwgu]
+   [app.main.data.workspace.indices :as dwidx]
    [app.main.data.workspace.interactions :as dwi]
    [app.main.data.workspace.layers :as dwly]
    [app.main.data.workspace.layout :as layout]
@@ -130,7 +129,7 @@
                           (rx/merge
                            (rx/of (dwn/initialize team-id file-id)
                                   (dwp/initialize-file-persistence file-id)
-                                  (dwidx/start-indexing file-id))
+                                  (dwidx/start-indexing))
 
                            (->> stream
                                 (rx/filter #(= ::dwc/index-initialized %))
@@ -197,7 +196,7 @@
     (watch [_ _ _]
       (rx/merge
        (rx/of (dwn/finalize file-id))
-       (rx/of (dwidx/stop-indexing file-id))
+       (rx/of (dwidx/stop-indexing))
        (->> (rx/of ::dwp/finalize)
             (rx/observe-on :async))))))
 
diff --git a/frontend/src/app/main/data/workspace/drawing/box.cljs b/frontend/src/app/main/data/workspace/drawing/box.cljs
index 6de3726a6..bdffbe1f7 100644
--- a/frontend/src/app/main/data/workspace/drawing/box.cljs
+++ b/frontend/src/app/main/data/workspace/drawing/box.cljs
@@ -75,7 +75,7 @@
                                          :height 0.01})
                         (cond-> (and (cph/frame-shape? shape)
                                      (not= fid uuid/zero))
-                          (assoc :fills [] :show-content true :hide-in-viewer true))
+                          (assoc :fills [] :hide-in-viewer true))
 
                         (assoc :frame-id fid)
                         (assoc :initialized? true)
diff --git a/frontend/src/app/main/data/workspace/indices.cljs b/frontend/src/app/main/data/workspace/indices.cljs
index 4cf4fb39a..739a3f9e8 100644
--- a/frontend/src/app/main/data/workspace/indices.cljs
+++ b/frontend/src/app/main/data/workspace/indices.cljs
@@ -6,12 +6,11 @@
 
 (ns app.main.data.workspace.indices
   (:require
-   [app.main.data.workspace.state-helpers :as wsh]
-   [app.main.data.workspace.indices.object-tree :as dwi-object-tree]
-   [app.main.refs :as refs]
    [app.main.data.workspace.changes :as dwc]
+   [app.main.data.workspace.indices.object-tree :as dwi-object-tree]
+   [app.main.data.workspace.state-helpers :as wsh]
+   [app.main.refs :as refs]
    [beicon.core :as rx]
-   [app.common.data :as d]
    [potok.core :as ptk]))
 
 (def stop-indexing? (ptk/type? ::stop-indexing))
@@ -19,7 +18,7 @@
 (def objects-changes #{:add-obj :mod-obj :del-obj :mov-objects})
 
 (defn stop-indexing
-  [file-id]
+  []
   (ptk/reify ::stop-indexing
     ptk/UpdateEvent
     (update [_ state]
@@ -41,13 +40,11 @@
   (ptk/reify ::update-indexing
     ptk/UpdateEvent
     (update [_ state]
-      (let [objects (wsh/lookup-page-objects state)]
-        (-> state
-            (update :index-object-tree dwi-object-tree/update-index shape-id change-type old-objects new-objects))))))
+      (-> state
+          (update :index-object-tree dwi-object-tree/update-index shape-id change-type old-objects new-objects)))))
 
 (defn start-indexing
-  [file-id]
-
+  []
   (ptk/reify ::start-indexing
     ptk/UpdateEvent
     (update [_ state]
@@ -56,7 +53,7 @@
             (assoc :index-object-tree (dwi-object-tree/init-index objects)))))
 
     ptk/WatchEvent
-    (watch [_ state stream]
+    (watch [_ _ stream]
       (let [stopper (->> stream (rx/filter stop-indexing?) (rx/take 1))
             objects-delta (->> (rx/from-atom refs/workspace-page-objects {:emit-current-value? true}) (rx/buffer 2 1))]
         (->> stream
diff --git a/frontend/src/app/main/data/workspace/indices/object_tree.cljs b/frontend/src/app/main/data/workspace/indices/object_tree.cljs
index e772b0ad8..b7aaad28d 100644
--- a/frontend/src/app/main/data/workspace/indices/object_tree.cljs
+++ b/frontend/src/app/main/data/workspace/indices/object_tree.cljs
@@ -4,25 +4,13 @@
 ;;
 ;; Copyright (c) UXBOX Labs SL
 
-(ns app.main.data.workspace.indices.object-tree
-  (:require
-   [app.common.pages.helpers :as cph]
-   ))
+(ns app.main.data.workspace.indices.object-tree)
 
 (defn objects-tree
-  [objects]
-
-  
-  
-  )
+  [_objects])
 
 (defn init-index
-  [objects]
-
-  
-
-  )
+  [_objects])
 
 (defn update-index
-  [index shape-id change-type old-objects new-objects]
-  )
+  [_index _shape-id _change-type _old-objects _new-objects])
diff --git a/frontend/src/app/main/errors.cljs b/frontend/src/app/main/errors.cljs
index 19dba98dc..c23092c51 100644
--- a/frontend/src/app/main/errors.cljs
+++ b/frontend/src/app/main/errors.cljs
@@ -7,7 +7,6 @@
 (ns app.main.errors
   "Generic error handling"
   (:require
-   [cuerdas.core :as str]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
@@ -21,6 +20,7 @@
    [app.util.i18n :refer [tr]]
    [app.util.router :as rt]
    [app.util.timers :as ts]
+   [cuerdas.core :as str]
    [potok.core :as ptk]))
 
 (defn on-error
diff --git a/frontend/src/app/main/render.cljs b/frontend/src/app/main/render.cljs
index 74729dbdf..bfb14c5d0 100644
--- a/frontend/src/app/main/render.cljs
+++ b/frontend/src/app/main/render.cljs
@@ -169,7 +169,7 @@
   [objects object-id]
   (let [object   (get objects object-id)
         object   (cond->> object
-                   (cph/root-frame? object)
+                   (cph/root? object)
                    (adapt-root-frame objects))
 
         ;; Replace the previous object with the new one
diff --git a/frontend/src/app/main/ui/hooks/resize.cljs b/frontend/src/app/main/ui/hooks/resize.cljs
index a2c52cd36..d640fd81b 100644
--- a/frontend/src/app/main/ui/hooks/resize.cljs
+++ b/frontend/src/app/main/ui/hooks/resize.cljs
@@ -6,10 +6,10 @@
 
 (ns app.main.ui.hooks.resize
   (:require
-   [app.main.ui.hooks :as hooks]
    [app.common.geom.point :as gpt]
    [app.common.logging :as log]
    [app.main.ui.context :as ctx]
+   [app.main.ui.hooks :as hooks]
    [app.util.dom :as dom]
    [app.util.storage :refer [storage]]
    [rumext.alpha :as mf]))
diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
index 7f23daf08..bef488434 100644
--- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs
@@ -6,14 +6,14 @@
 
 (ns app.main.ui.workspace.shapes.frame
   (:require
-   [app.main.store :as st]
-   [app.main.data.workspace.state-helpers :as wsh]
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.uuid :as uuid]
+   [app.main.data.workspace.state-helpers :as wsh]
    [app.main.data.workspace.thumbnails :as dwt]
    [app.main.fonts :as fonts]
    [app.main.refs :as refs]
+   [app.main.store :as st]
    [app.main.ui.context :as ctx]
    [app.main.ui.hooks :as hooks]
    [app.main.ui.shapes.embed :as embed]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
index 898339807..4d05ca584 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
@@ -6,10 +6,10 @@
 
 (ns app.main.ui.workspace.sidebar.options.menus.measures
   (:require
-   [app.main.constants :refer [size-presets]]
    [app.common.data :as d]
    [app.common.geom.shapes :as gsh]
    [app.common.spec.radius :as ctr]
+   [app.main.constants :refer [size-presets]]
    [app.main.data.workspace :as udw]
    [app.main.data.workspace.changes :as dch]
    [app.main.refs :as refs]
@@ -204,13 +204,6 @@
         on-radius-r3-change #(on-radius-4-change % :r3)
         on-radius-r4-change #(on-radius-4-change % :r4)
 
-        on-change-clip-content
-        (mf/use-callback
-         (mf/deps ids)
-         (fn [event]
-           (let [value (-> event dom/get-target dom/checked?)]
-             (dch/update-shapes ids (fn [shape]) (assoc shape :show-content (not value))))))
-
         on-change-clip-content
         (mf/use-callback
          (mf/deps ids)
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 1f55733c0..54ecef54b 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -10,6 +10,7 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.geom.shapes :as gsh]
+   [app.common.pages.helpers :as cph]
    [app.main.refs :as refs]
    [app.main.ui.context :as ctx]
    [app.main.ui.hooks :as ui-hooks]
@@ -156,6 +157,7 @@
         show-gradient-handlers?  (= (count selected) 1)
         show-grids?              (contains? layout :display-grid)
 
+        show-frame-outline?      (= transform :move)
         show-outlines?           (and (nil? transform)
                                       (not edition)
                                       (not drawing-obj)
@@ -280,6 +282,14 @@
        (when show-text-editor?
          [:& editor/text-editor-svg {:shape editing-shape}])
 
+       (when show-frame-outline?
+         [:& outline/shape-outlines
+          {:objects base-objects
+           :hover #{(->> @hover-ids
+                         (filter #(cph/frame-shape? base-objects %))
+                         (first))}
+           :zoom zoom}])
+
        (when show-outlines?
          [:& outline/shape-outlines
           {:objects base-objects
@@ -314,7 +324,6 @@
         {:objects base-objects
          :selected selected
          :zoom zoom
-         :modifiers modifiers
          :show-artboard-names? show-artboard-names?
          :on-frame-enter on-frame-enter
          :on-frame-leave on-frame-leave
diff --git a/frontend/src/app/main/ui/workspace/viewport/actions.cljs b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
index 5501998e6..b02b80489 100644
--- a/frontend/src/app/main/ui/workspace/viewport/actions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/actions.cljs
@@ -50,9 +50,7 @@
              mod?   (kbd/mod? event)
 
              left-click?   (and (not panning) (= 1 (.-which event)))
-             middle-click? (and (not panning) (= 2 (.-which event)))
-
-             selected? (contains? selected id)]
+             middle-click? (and (not panning) (= 2 (.-which event)))]
 
          (cond
            middle-click?
@@ -155,7 +153,6 @@
              shift? (kbd/shift? event)
              alt? (kbd/alt? event)
              meta? (kbd/meta? event)
-             mod? (kbd/mod? event)
              hovering? (some? @hover)]
          (st/emit! (ms/->MouseEvent :click ctrl? shift? alt? meta?))
 
diff --git a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
index 71da7118d..6dca71f82 100644
--- a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs
@@ -6,11 +6,11 @@
 
 (ns app.main.ui.workspace.viewport.hooks
   (:require
+   [app.common.data :as d]
    [app.common.geom.shapes :as gsh]
    [app.common.pages :as cp]
    [app.common.pages.helpers :as cph]
    [app.common.uuid :as uuid]
-   [app.common.data :as d]
    [app.main.data.shortcuts :as dsc]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.path.shortcuts :as psc]
@@ -130,8 +130,7 @@
                   :page-id page-id
                   :rect rect
                   :include-frames? true
-                  :clip-children? (not mod?)
-                  :reverse? true}))))) ;; we want the topmost shape to be selected first
+                  :clip-children? (not mod?)})))))
 
         over-shapes-stream
         (mf/use-memo
@@ -145,14 +144,7 @@
 
              (->> move-stream
                   ;; When transforming shapes we stop querying the worker
-                  (rx/filter #(not (some? (mf/ref-val transform-ref))))
                   (rx/merge-map query-point)
-                  (rx/tap #(reset! last-point-ref %)))
-
-             (->> move-stream
-                  ;; When transforming shapes we stop querying the worker
-                  (rx/filter #(some? (mf/ref-val transform-ref)))
-                  (rx/map (constantly nil))
                   (rx/tap #(reset! last-point-ref %))))))]
 
     ;; Refresh the refs on a value change
@@ -186,21 +178,25 @@
      over-shapes-stream
      (mf/deps page-id objects)
      (fn [ids]
-       (let [ids (into
+       (let [selected (mf/ref-val selected-ref)
+             focus (mf/ref-val focus-ref)
+             mod? (mf/ref-val mod-ref)
+
+             ids (into
                   (d/ordered-set)
-                  (cph/sort-z-index objects ids))
+                  (cph/sort-z-index objects ids {:bottom-frames? mod?}))
 
              grouped? (fn [id] (contains? #{:group :bool} (get-in objects [id :type])))
 
-             selected (mf/ref-val selected-ref)
-             focus (mf/ref-val focus-ref)
 
-             mod? (mf/ref-val mod-ref)
 
              remove-xfm (mapcat #(cph/get-parent-ids objects %))
              remove-id? (cond-> (into #{} remove-xfm selected)
                           (not mod?)
-                          (into (filter #(group-empty-space? % objects ids)) ids)
+                          (into
+                           (filter #(or (and (cph/root-frame? objects %) (d/not-empty? (get-in objects [% :shapes])))
+                                        (group-empty-space? % objects ids)))
+                           ids)
 
                           mod?
                           (into (filter grouped?) ids))
diff --git a/frontend/src/app/main/ui/workspace/viewport/outline.cljs b/frontend/src/app/main/ui/workspace/viewport/outline.cljs
index ae79dcbbc..d1f6eaf46 100644
--- a/frontend/src/app/main/ui/workspace/viewport/outline.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/outline.cljs
@@ -8,8 +8,6 @@
   (:require
    [app.common.exceptions :as ex]
    [app.common.geom.shapes :as gsh]
-   [app.common.pages.helpers :as cph]
-   [app.main.refs :as refs]
    [app.util.object :as obj]
    [app.util.path.format :as upf]
    [clojure.set :as set]
@@ -41,7 +39,7 @@
 
         common {:fill "none"
                 :stroke color
-                :strokeWidth (/ 1 zoom)
+                :strokeWidth (/ 2 zoom)
                 :pointerEvents "none"
                 :transform transform}
 
@@ -82,15 +80,12 @@
   [props]
   (let [selected  (or (obj/get props "selected") #{})
         hover     (or (obj/get props "hover") #{})
+
         objects   (obj/get props "objects")
         edition   (obj/get props "edition")
         zoom      (obj/get props "zoom")
 
-        transform (mf/deref refs/current-transform)
-
-        outlines-ids  (->> (set/union selected hover)
-                           (cph/clean-loops objects))
-
+        outlines-ids  (set/union selected hover)
         show-outline? (fn [shape] (and (not (:hidden shape))
                                        (not (:blocked shape))))
 
@@ -100,6 +95,6 @@
                     (filterv show-outline?)
                     (filter some?))]
 
-    [:g.outlines {:display (when (some? transform) "none")}
+    [:g.outlines
      [:& shape-outlines-render {:shapes shapes
                                 :zoom zoom}]]))
diff --git a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
index 314233ae4..fc840f671 100644
--- a/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/widgets.cljs
@@ -6,11 +6,11 @@
 
 (ns app.main.ui.workspace.viewport.widgets
   (:require
-   [app.common.uuid :as uuid]
    [app.common.data.macros :as dm]
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.pages.helpers :as cph]
+   [app.common.uuid :as uuid]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.interactions :as dwi]
    [app.main.refs :as refs]
@@ -93,7 +93,7 @@
 
 (mf/defc frame-title
   {::mf/wrap [mf/memo]}
-  [{:keys [frame modifiers selected? zoom show-artboard-names? on-frame-enter on-frame-leave on-frame-select]}]
+  [{:keys [frame selected? zoom show-artboard-names? on-frame-enter on-frame-leave on-frame-select]}]
   (let [{:keys [width x y]} frame
         label-pos (gpt/point x (- y (/ 10 zoom)))
 
diff --git a/frontend/src/app/worker/selection.cljs b/frontend/src/app/worker/selection.cljs
index dddee6f55..b5576d291 100644
--- a/frontend/src/app/worker/selection.cljs
+++ b/frontend/src/app/worker/selection.cljs
@@ -84,19 +84,12 @@
         index-shape        (make-index-shape objects parents-index clip-parents-index)
         initial-quadtree   (qdt/create (clj->js bounds))
 
-        index              (reduce index-shape initial-quadtree shapes)
+        index              (reduce index-shape initial-quadtree shapes)]
 
-        ;;z-index            (cp/calculate-z-index objects)
-        ]
-
-    {:index index
-     ;;:z-index z-index
-     :bounds bounds}))
+    {:index index :bounds bounds}))
 
 (defn- update-index
-  [{index :index
-    ;; z-index :z-index
-    :as data} old-objects new-objects]
+  [{index :index :as data} old-objects new-objects]
   (let [changes? (fn [id]
                    (not= (get old-objects id)
                          (get new-objects id)))
@@ -115,18 +108,12 @@
         new-index (qdt/remove-all index changed-ids)
 
         index-shape (make-index-shape new-objects parents-index clip-parents-index)
-        index (reduce index-shape new-index shapes)
+        index (reduce index-shape new-index shapes)]
 
-        ;;z-index (cp/update-z-index z-index changed-ids old-objects new-objects)
-        ]
-
-    (assoc data :index index ;;:z-index z-index
-           )))
+    (assoc data :index index)))
 
 (defn- query-index
-  [{index :index
-    ;;z-index :z-index
-    } rect frame-id full-frame? include-frames? ignore-groups? clip-children? reverse?]
+  [{index :index} rect frame-id full-frame? include-frames? ignore-groups? clip-children?]
   (let [result (-> (qdt/search index (clj->js rect))
                    (es6-iterator-seq))
 
@@ -152,33 +139,18 @@
 
         overlaps-parent?
         (fn [clip-parents]
-          (->> clip-parents (some (comp not overlaps?)) not))
-
-        ;;add-z-index
-        ;;(fn [{:keys [id frame-id] :as shape}]
-        ;;  (assoc shape :z (+ (get z-index id)
-        ;;                     (get z-index frame-id 0))))
-
-        ;; Shapes after filters of overlapping and criteria
-        matching-shapes
-        (into []
-              (comp (map #(unchecked-get % "data"))
-                    (filter match-criteria?)
-                    (filter overlaps?)
-                    (filter (comp overlaps? :frame))
-                    (filter (if clip-children?
-                              (comp overlaps-parent? :clip-parents)
-                              (constantly true)))
-                    #_(map add-z-index))
-              result)
-
-        ;;keyfn (if reverse? (comp - :z) :z)
-        ]
+          (->> clip-parents (some (comp not overlaps?)) not))]
 
+    ;; Shapes after filters of overlapping and criteria
     (into (d/ordered-set)
-          (->> matching-shapes
-               #_(sort-by keyfn)
-               (map :id)))))
+          (comp (map #(unchecked-get % "data"))
+                (filter match-criteria?)
+                (filter overlaps?)
+                (filter (if clip-children?
+                          (comp overlaps-parent? :clip-parents)
+                          (constantly true)))
+                (map :id))
+          result)))
 
 
 (defmethod impl/handler :selection/initialize-index
@@ -213,13 +185,8 @@
   nil)
 
 (defmethod impl/handler :selection/query
-  [{:keys [page-id rect frame-id reverse? full-frame? include-frames? ignore-groups? clip-children?]
-    :or {reverse? false full-frame? false include-frames? false clip-children? true} :as message}]
+  [{:keys [page-id rect frame-id full-frame? include-frames? ignore-groups? clip-children?]
+    :or {full-frame? false include-frames? false clip-children? true} :as message}]
   (when-let [index (get @state page-id)]
-    (query-index index rect frame-id full-frame? include-frames? ignore-groups? clip-children? reverse?)))
+    (query-index index rect frame-id full-frame? include-frames? ignore-groups? clip-children?)))
 
-#_(defmethod impl/handler :selection/query-z-index
-  [{:keys [page-id objects ids]}]
-  (when-let [{z-index :z-index} (get @state page-id)]
-    (->> ids (map #(+ (get z-index %)
-                      (get z-index (get-in objects [% :frame-id])))))))