                   #js {:transform (cameras/->svg-transform camera)}
                   (om/build cursors (select-keys payload [:subscribers :client-id]))
                   (om/build svg-layers (assoc (select-keys payload [:selected-eids :document/id])
-                                         :editing-eids (set (concat (when (or (settings/drawing-in-progress? payload)
-                                                                              (settings/moving-drawing? payload))
-                                                                      (concat [(:db/id (settings/drawing payload))]
-                                                                              (map :db/id (get-in payload [:drawing :layers]))))
-                                                                    (remove nil? (map :db/id subs-layers))))
-                                         :tool (get-in payload state/current-tool-path)))
+                                              :editing-eids (set (concat (when (or (settings/drawing-in-progress? payload)
+                                                                                   (settings/moving-drawing? payload))
+                                                                           (concat [(:db/id (settings/drawing payload))]
+                                                                                   (map :db/id (get-in payload [:drawing :layers]))))
+                                                                         (remove nil? (map :db/id subs-layers))))
+                                              :tool (get-in payload state/current-tool-path)))
                   (om/build subscriber-layers {:layers subs-layers})
                   (when (and (settings/drawing-in-progress? payload)
                              (= :layer.type/text (get-in payload [:drawing :layers 0 :layer/type])))

                                  :cursor (state->cursor payload)}
                      :onTouchStart (fn [event]
                                      (let [touches (.-touches event)]
                                        (when (= (.-length touches) 1)
                                          (.preventDefault event)
                                          ;; This was keeping app-main's touch event from working
                                          ;; (.stopPropagation event)
                                          (js/console.log event)
                                          (om/set-state! owner :touch-timer (js/setTimeout #(cast! :menu-opened) 500))
                                          ((:handle-mouse-down handlers) (aget touches "0")))))
                      :onTouchEnd (fn [event]
                                    (.preventDefault event)
                                        ; (.stopPropagation event)
                                    (js/console.log event)
                                    (js/clearInterval (om/get-state owner :touch-timer))
                                    ((:handle-mouse-up handlers) event))
                      :onTouchMove (fn [event]
                                     (let [touches (.-touches event)]
                                       (when (= (.-length touches) 1)
                                         (.preventDefault event)
                                         (.stopPropagation event)
                                         (js/console.log event)
                                         (js/clearInterval (om/get-state owner :touch-timer))
                                         ((:handle-mouse-move! handlers) (aget touches "0")))))
                      :onMouseDown (fn [event]
                                     ((:handle-mouse-down handlers) event)
                                     ;;(.preventDefault event)
                                     (.stopPropagation event)
                                     )
                      :onMouseUp (fn [event]
                                   ((:handle-mouse-up handlers) event)
                                   ;(.preventDefault event)
                                   (.stopPropagation event))
                      :onWheel (fn [event]
                                 (let [dx     (- (aget event "deltaX"))

                                                :y (get-in payload [:layer-properties-menu :y])}))

                  (when-let [sels (cond
                                    (settings/moving-drawing? payload) (remove #(= :layer.type/group (:layer/type %))
                                                                               (settings/drawing payload))
                                    (= :layer.type/text (get-in payload [:drawing :layers 0 :layer/type])) nil
                                    (settings/drawing-in-progress? payload) (settings/drawing payload)
                                    :else nil)]
                    (apply dom/g #js {:className "layers"}
                           (map (fn [sel]
                                  (let [sel (if (:force-even? sel)
