diff --git a/common/src/app/common/geom/shapes/transforms.cljc b/common/src/app/common/geom/shapes/transforms.cljc
index e5eae48eb..ebde6bf80 100644
--- a/common/src/app/common/geom/shapes/transforms.cljc
+++ b/common/src/app/common/geom/shapes/transforms.cljc
@@ -299,12 +299,16 @@
 
     (cond-> shape
       (neg? dot-x)
-      (-> (cr/update! :flip-x not)
-          (cr/update! :rotation -))
+      (cr/update! :flip-x not)
+
+      (neg? dot-x)
+      (cr/update! :rotation -)
 
       (neg? dot-y)
-      (-> (cr/update! :flip-y not)
-          (cr/update! :rotation -)))))
+      (cr/update! :flip-y not)
+
+      (neg? dot-y)
+      (cr/update! :rotation -))))
 
 (defn- apply-transform-move
   "Given a new set of points transformed, set up the rectangle so it keeps
diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index 2101f90f7..e76fbe2a6 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -31,7 +31,7 @@
    [app.common.uuid :as uuid]
    [clojure.set :as set]))
 
-(cr/defrecord Shape [id name type x y width height rotation selrect points transform transform-inverse parent-id frame-id])
+(cr/defrecord Shape [id name type x y width height rotation selrect points transform transform-inverse parent-id frame-id flip-x flip-y])
 
 (defn shape?
   [o]
diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs
index 807db96e8..0a441068f 100644
--- a/frontend/src/app/main/data/comments.cljs
+++ b/frontend/src/app/main/data/comments.cljs
@@ -249,14 +249,16 @@
 
     ptk/UpdateEvent
     (update [_ state]
-      (d/update-in-when state [:comments thread-id id] assoc :content content))
+      (-> state
+          (d/update-in-when [:comments thread-id id] assoc :content content)))
 
     ptk/WatchEvent
     (watch [_ state _]
-      (let [share-id (-> state :viewer-local :share-id)]
+      (let [file-id (:current-file-id state)
+            share-id (-> state :viewer-local :share-id)]
         (->> (rp/cmd! :update-comment {:id id :content content :share-id share-id})
              (rx/catch #(rx/throw {:type :comment-error}))
-             (rx/ignore))))))
+             (rx/map #(retrieve-comment-threads file-id)))))))
 
 (defn delete-comment-thread-on-workspace
   [{:keys [id] :as thread}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss b/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss
index 1fad7eeb8..72706d601 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.scss
@@ -66,8 +66,7 @@
 
   &:hover {
     .cell-name {
-      display: grid;
-      grid-template-columns: 1fr auto;
+      display: block;
     }
   }
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
index debc36252..afe62a2b1 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs
@@ -144,7 +144,10 @@
                   (conj :rect :circle :path :bool))]
     (or (= uuid/zero id)
         (and (or (str/includes? (str/lower (:name shape)) (str/lower search))
-                 (str/includes? (dm/str (:id shape)) (str/lower search)))
+                 ;; Only for local development we allow search for ids. Otherwise will be hard
+                 ;; search for numbers or single letter shape names (ie: "A")
+                 (and *assert*
+                      (str/includes? (dm/str (:id shape)) (str/lower search))))
              (or (empty? filters)
                  (and (contains? filters :component)
                       (contains? shape :component-id))
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
index d5170a8b5..570b25faf 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs
@@ -616,9 +616,10 @@
 
             [:div {:class (stl/css :name-wrapper)}
              [:div {:class (stl/css :component-name)}
-              (if multi
-                (tr "settings.multiple")
-                (cfh/last-path shape-name))]
+              [:span {:class (stl/css :component-name-inside)}
+               (if multi
+                 (tr "settings.multiple")
+                 (cfh/last-path shape-name))]]
 
              (when (and can-swap? (not multi))
                [:div {:class (stl/css :component-parent-name)}
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
index c36756069..d024187a7 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.scss
@@ -56,7 +56,6 @@
     padding-right: 0.5rem;
     .component-name-wrapper {
       width: 100%;
-
       border-radius: $br-8;
     }
   }
@@ -93,6 +92,7 @@
   min-height: $s-32;
   padding: $s-8 0 $s-8 $s-2;
   border-radius: $br-8 0 0 $br-8;
+  overflow: hidden;
 }
 
 .component-name {
@@ -103,6 +103,11 @@
   min-height: $s-16;
 }
 
+.component-name-inside {
+  direction: ltr;
+  unicode-bidi: bidi-override;
+}
+
 .component-parent-name {
   @include bodySmallTypography;
   @include textEllipsis;
diff --git a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
index 4fde27d0c..20d41a9f7 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/shortcuts.cljs
@@ -189,6 +189,7 @@
   ;;   shortcuts.unmask
   ;;   shortcuts.v-distribute
   ;;   shortcuts.zoom-selected
+  ;;   shortcuts.toggle-layout-grid
   (let [translat-pre (case type
                        :sc      "shortcuts."
                        :sec     "shortcut-section."
diff --git a/frontend/src/app/main/ui/workspace/viewport/selection.cljs b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
index ed91e2b6c..8d04c1ac2 100644
--- a/frontend/src/app/main/ui/workspace/viewport/selection.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
@@ -335,8 +335,8 @@
 
         flip-x         (get shape :flip-x)
         flip-y         (get shape :flip-y)
-        half-flip?     (or (and (some? flip-x) (not (some? flip-y)))
-                           (and (some? flip-y) (not (some? flip-x))))]
+        half-flip?     (or (and flip-x (not flip-y))
+                           (and flip-y (not flip-x)))]
 
     (when (and (not ^boolean read-only?)
                (not (:transforming shape))
@@ -357,7 +357,7 @@
                           (and ^boolean half-flip?
                                (or (= position :top-right)
                                    (= position :bottom-left)))
-                          (- rotation 90)
+                          (+ rotation 90)
 
                           :else
                           rotation)
diff --git a/frontend/src/app/util/code_gen/style_css_formats.cljs b/frontend/src/app/util/code_gen/style_css_formats.cljs
index 69f841dc9..0a9cdd515 100644
--- a/frontend/src/app/util/code_gen/style_css_formats.cljs
+++ b/frontend/src/app/util/code_gen/style_css_formats.cljs
@@ -20,6 +20,8 @@
    :height                :size
    :min-width             :size
    :min-height            :size
+   :max-width             :size
+   :max-height            :size
    :background            :color
    :border                :border
    :border-radius         :string-or-size-array
diff --git a/frontend/translations/en.po b/frontend/translations/en.po
index 498fd2597..64d26fe66 100644
--- a/frontend/translations/en.po
+++ b/frontend/translations/en.po
@@ -3023,6 +3023,9 @@ msgstr "Zoom lense increase"
 msgid "shortcuts.zoom-selected"
 msgstr "Zoom to selected"
 
+msgid "shortcuts.toggle-layout-grid"
+msgstr "Add/remove grid layout"
+
 #: src/app/main/ui/dashboard/team.cljs
 msgid "team.webhooks.max-length"
 msgstr "The webhook name must contain at most 2048 characters."
diff --git a/frontend/translations/es.po b/frontend/translations/es.po
index 02f484954..18ee3b030 100644
--- a/frontend/translations/es.po
+++ b/frontend/translations/es.po
@@ -3069,6 +3069,9 @@ msgstr "Incrementar zoom a objetivo"
 msgid "shortcuts.zoom-selected"
 msgstr "Zoom a selección"
 
+msgid "shortcuts.toggle-layout-grid"
+msgstr "Añadir/eliminar grid layout"
+
 #: src/app/main/ui/dashboard/team.cljs
 msgid "team.webhooks.max-length"
 msgstr "El nombre del webhook debe contener como máximo 2048 caracteres."