diff --git a/engine/includes/components/actor.h b/engine/includes/components/actor.h
index 9066ac017..8f318687c 100644
--- a/engine/includes/components/actor.h
+++ b/engine/includes/components/actor.h
@@ -30,9 +30,11 @@ class ENGINE_EXPORT Actor : public Object {
     )
 
 public:
-    enum HideFlags {
-        ENABLE = (1<<0),
-        SELECTABLE = (1<<1)
+    enum Flags {
+        Enable = (1<<0),
+        Selectable = (1<<1),
+        NonSerializable = (1<<2),
+        Static = (1<<3)
     };
 
 public:
@@ -62,8 +64,8 @@ class ENGINE_EXPORT Actor : public Object {
     bool isEnabled() const;
     void setEnabled(const bool enabled);
 
-    int hideFlags() const;
-    void setHideFlags(int flags);
+    int flags() const;
+    void setFlags(int flags);
 
     bool isEnabledInHierarchy() const;
 
@@ -120,8 +122,6 @@ class ENGINE_EXPORT Actor : public Object {
 
     bool m_hierarchyEnable;
 
-    bool m_static;
-
     bool m_muteUpdates;
 
 };
diff --git a/engine/includes/components/camera.h b/engine/includes/components/camera.h
index 8a572ac7b..6c868a502 100644
--- a/engine/includes/components/camera.h
+++ b/engine/includes/components/camera.h
@@ -62,6 +62,9 @@ class ENGINE_EXPORT Camera : public Component {
     bool orthographic() const;
     void setOrthographic(const bool mode);
 
+    bool isScreenSpace() const;
+    void setScreenSpace(bool mode);
+
     static Camera *current();
     static void setCurrent(Camera *current);
 
@@ -100,6 +103,8 @@ class ENGINE_EXPORT Camera : public Component {
 
     bool m_ortho;
 
+    bool m_screen;
+
 };
 
 #endif // CAMERA_H
diff --git a/engine/includes/editor/viewport/tasks/gridrender.h b/engine/includes/editor/viewport/tasks/gridrender.h
index b8c7def0e..4b9637759 100644
--- a/engine/includes/editor/viewport/tasks/gridrender.h
+++ b/engine/includes/editor/viewport/tasks/gridrender.h
@@ -131,6 +131,11 @@ class GridRender : public PipelineTask {
                 } break;
                 default: break;
             }
+
+            if(camera->isScreenSpace()) {
+                pos += planeScale * 0.5f;
+            }
+
         } else {
             Ray ray = camera->castRay(0.0f, 0.0f);
 
diff --git a/engine/src/components/actor.cpp b/engine/src/components/actor.cpp
index e7362c051..129efb1e1 100644
--- a/engine/src/components/actor.cpp
+++ b/engine/src/components/actor.cpp
@@ -68,9 +68,8 @@ Actor::Actor() :
         m_prefab(nullptr),
         m_scene(nullptr),
         m_layers(CommandBuffer::DEFAULT | CommandBuffer::RAYCAST | CommandBuffer::SHADOWCAST | CommandBuffer::TRANSLUCENT),
-        m_flags(Actor::ENABLE | Actor::SELECTABLE),
-        m_hierarchyEnable(m_flags & Actor::ENABLE),
-        m_static(false),
+        m_flags(Actor::Enable | Actor::Selectable),
+        m_hierarchyEnable(m_flags & Actor::Enable),
         m_muteUpdates(false) {
 
 }
@@ -91,7 +90,7 @@ Actor::~Actor() {
 */
 bool Actor::isEnabled() const {
     PROFILE_FUNCTION();
-    return m_flags & ENABLE;
+    return m_flags & Enable;
 }
 /*!
     Marks this Actor as \a enabled or disabled.
@@ -100,9 +99,9 @@ bool Actor::isEnabled() const {
 void Actor::setEnabled(const bool enabled) {
     PROFILE_FUNCTION();
     if(enabled) {
-        m_flags |= ENABLE;
+        m_flags |= Enable;
     } else {
-        m_flags &= ~ENABLE;
+        m_flags &= ~Enable;
     }
 
     setHierarchyEnabled(enabled);
@@ -112,17 +111,17 @@ void Actor::setEnabled(const bool enabled) {
     }
 }
 /*!
-    Returns a set of Actor::HideFlags applied to this Actor.
+    Returns a set of Actor::Flags applied to this Actor.
 */
-int Actor::hideFlags() const {
+int Actor::flags() const {
     PROFILE_FUNCTION();
 
     return m_flags;
 }
 /*!
-    Applies a new set of Actor::HideFlags \a flags to this Actor.
+    Applies a new set of Actor::Flags \a flags to this Actor.
 */
-void Actor::setHideFlags(int flags) {
+void Actor::setFlags(int flags) {
     PROFILE_FUNCTION();
 
     bool old = isEnabled();
@@ -173,14 +172,18 @@ void Actor::setScene(Scene *scene) {
     Returns true if this actor will not be moved during the game; otherwise returns false.
 */
 bool Actor::isStatic() const {
-    return m_static;
+    return m_flags & Static;
 }
 /*!
     Marks current Actor as static or dynamic (by default).
     This \a flag can help to optimize rendering.
 */
 void Actor::setStatic(const bool flag) {
-    m_static = flag;
+    if(flag) {
+        m_flags |= Static;
+    } else {
+        m_flags &= ~Static;
+    }
 }
 /*!
     Returns the layers list for the this Actor as a bit mask.
@@ -283,7 +286,7 @@ Component *Actor::addComponent(const std::string type) {
 */
 bool Actor::isSerializable() const {
     PROFILE_FUNCTION();
-    return (clonedFrom() == 0 || isInstance());
+    return !(m_flags & NonSerializable) && (clonedFrom() == 0 || isInstance());
 }
 /*!
     \internal
diff --git a/engine/src/components/camera.cpp b/engine/src/components/camera.cpp
index 0d32efb94..a225e8223 100644
--- a/engine/src/components/camera.cpp
+++ b/engine/src/components/camera.cpp
@@ -23,7 +23,8 @@ Camera::Camera() :
         m_ratio(1.0f),
         m_focal(1.0f),
         m_orthoSize(1.0f),
-        m_ortho(false) {
+        m_ortho(false),
+        m_screen(false) {
 
     recalcProjection();
 }
@@ -69,11 +70,10 @@ Vector3 Camera::project(const Vector3 &worldSpace) {
 Vector3 Camera::unproject(const Vector3 &screenSpace) {
     Matrix4 final((m_projection * viewMatrix()).inverse());
 
-    Vector4 in;
-    in.x = (screenSpace.x) * 2.0f - 1.0f;
-    in.y = (screenSpace.y) * 2.0f - 1.0f;
-    in.z = 2.0f * screenSpace.z - 1.0f;
-    in.w = 1.0f;
+    Vector4 in(2.0f * screenSpace.x - 1.0f,
+               2.0f * screenSpace.y - 1.0f,
+               2.0f * screenSpace.z - 1.0f,
+               1.0f);
 
     Vector4 out(final * in);
 
@@ -210,6 +210,21 @@ void Camera::setOrthographic(const bool mode) {
     m_ortho = mode;
     recalcProjection();
 }
+/*!
+    Returns true is this camera in the screen space mode.
+    Typically used for Editor.
+*/
+bool Camera::isScreenSpace() const {
+    return m_screen;
+}
+/*!
+    Sets the screen space \a mode for the camera.
+    Typically used for Editor.
+*/
+void Camera::setScreenSpace(bool mode) {
+    m_screen = mode;
+    recalcProjection();
+}
 /*!
     Returns current active camera.
 */
@@ -328,7 +343,11 @@ void Camera::drawGizmosSelected() {
 void Camera::recalcProjection() {
     if(m_ortho) {
         float width = m_orthoSize * m_ratio;
-        m_projection = Matrix4::ortho(-width / 2, width / 2, -m_orthoSize / 2, m_orthoSize / 2, m_near, m_far);
+        if(m_screen) {
+            m_projection = Matrix4::ortho(0, width, 0, m_orthoSize, m_near, m_far);
+        } else {
+            m_projection = Matrix4::ortho(-width / 2, width / 2, -m_orthoSize / 2, m_orthoSize / 2, m_near, m_far);
+        }
     } else {
         m_projection = Matrix4::perspective(m_fov, m_ratio, m_near, m_far);
     }
diff --git a/engine/src/components/transform.cpp b/engine/src/components/transform.cpp
index db408794b..960482bc7 100644
--- a/engine/src/components/transform.cpp
+++ b/engine/src/components/transform.cpp
@@ -67,9 +67,11 @@ Vector3 Transform::position() const {
     Changes \a position of the Transform in local space.
 */
 void Transform::setPosition(const Vector3 position) {
-    std::unique_lock<std::mutex> locker(m_mutex);
-    m_position = position;
-    setDirty();
+    if(m_position != position) {
+        std::unique_lock<std::mutex> locker(m_mutex);
+        m_position = position;
+        setDirty();
+    }
 }
 /*!
     Returns current rotation of the Transform in local space as Euler angles in degrees.
diff --git a/engine/src/editor/viewport/viewport.cpp b/engine/src/editor/viewport/viewport.cpp
index fa5908f74..11062a4e3 100644
--- a/engine/src/editor/viewport/viewport.cpp
+++ b/engine/src/editor/viewport/viewport.cpp
@@ -91,6 +91,8 @@ void Viewport::init() {
         m_color = pipelineContext->resultTexture();
         m_color->setFlags(m_color->flags() | Texture::Feedback);
 
+        m_debugRender = new DebugRender;
+
         if(!m_gameView) {
             m_gridRender = new GridRender;
             m_gridRender->setController(m_controller);
@@ -112,14 +114,12 @@ void Viewport::init() {
 
             pipelineContext->insertRenderTask(m_gridRender, m_guiLayer);
             pipelineContext->insertRenderTask(m_outlinePass, m_guiLayer);
-            pipelineContext->insertRenderTask(m_gizmoRender, m_guiLayer);
+            pipelineContext->insertRenderTask(m_gizmoRender);
 
             Handles::init();
         }
 
-        m_debugRender = new DebugRender;
         pipelineContext->insertRenderTask(m_debugRender, m_guiLayer);
-
         pipelineContext->subscribePost(Viewport::readPixels, this);
     }
 }
diff --git a/engine/src/pipelinecontext.cpp b/engine/src/pipelinecontext.cpp
index ae47fbb76..3af606729 100644
--- a/engine/src/pipelinecontext.cpp
+++ b/engine/src/pipelinecontext.cpp
@@ -397,7 +397,7 @@ void PipelineContext::drawRenderers(const RenderList &list, uint32_t layer, uint
         if(it) {
             Actor *actor = it->actor();
 
-            if((flags == 0 || actor->hideFlags() & flags) && actor->layers() & layer) {
+            if((flags == 0 || actor->flags() & flags) && actor->layers() & layer) {
                 for(int32_t i = 0; i < it->m_materials.size(); i++) {
                     MaterialInstance *instance = it->m_materials[i];
                     if(instance->transform() == nullptr) {
diff --git a/modules/uikit/includes/components/frame.h b/modules/uikit/includes/components/frame.h
index c056fc68f..a37adfe54 100644
--- a/modules/uikit/includes/components/frame.h
+++ b/modules/uikit/includes/components/frame.h
@@ -58,8 +58,6 @@ class UIKIT_EXPORT Frame : public Widget {
     Vector4 m_bottomColor;
     Vector4 m_leftColor;
 
-    Vector2 m_meshSize;
-
     Mesh *m_mesh;
 
     MaterialInstance *m_material;
diff --git a/modules/uikit/includes/components/uiloader.h b/modules/uikit/includes/components/uiloader.h
index 481234ef6..61943bfcc 100644
--- a/modules/uikit/includes/components/uiloader.h
+++ b/modules/uikit/includes/components/uiloader.h
@@ -35,8 +35,6 @@ class UIKIT_EXPORT UiLoader : public Widget {
 
     void cleanHierarchy(Widget *widget);
 
-    void drawGizmos() override;
-
 private:
     std::string m_documentStyle;
 
diff --git a/modules/uikit/includes/components/widget.h b/modules/uikit/includes/components/widget.h
index efd8cddf3..d68980c50 100644
--- a/modules/uikit/includes/components/widget.h
+++ b/modules/uikit/includes/components/widget.h
@@ -54,8 +54,6 @@ class UIKIT_EXPORT Widget : public NativeBehaviour {
 
     void setParent(Object *parent, int32_t position = -1, bool force = false) override;
 
-    void drawGizmosSelected() override;
-
     float styleLength(const std::string &key, float value, bool &pixels);
     Vector2 styleBlock2Length(const std::string &property, const Vector2 &value, bool &pixels);
     Vector4 styleBlock4Length(const std::string &property, const Vector4 &value, bool &pixels);
diff --git a/modules/uikit/includes/editor/tools/widgettool.h b/modules/uikit/includes/editor/tools/widgettool.h
index 615c90a12..c4ce8b2c7 100644
--- a/modules/uikit/includes/editor/tools/widgettool.h
+++ b/modules/uikit/includes/editor/tools/widgettool.h
@@ -4,32 +4,13 @@
 #include <editor/editortool.h>
 
 class WidgetController;
-class Renderable;
+class RectTransform;
 
 class WidgetTool : public EditorTool {
-public:
-    struct Select {
-        bool operator==(const Select &left) {
-            return (uuid == left.uuid);
-        }
-
-        uint32_t uuid = 0;
-        Actor *object = nullptr;
-        Renderable *renderable = nullptr;
-
-        Vector3 position;
-        Vector3 scale;
-        Vector3 euler;
-        Quaternion quat;
-    };
-
-    typedef QList<Select> SelectList;
-
 public:
     explicit WidgetTool(WidgetController *controller);
 
     Vector3 objectPosition();
-    AABBox objectBound();
 
 protected:
     void update(bool pivot, bool local, bool snap) override;
@@ -38,22 +19,22 @@ class WidgetTool : public EditorTool {
     void endControl() override;
     void cancelControl() override;
 
+    Vector3 recalcPosition(RectTransform *rect, RectTransform *root) const;
+
     std::string icon() const override;
     std::string name() const override;
 
     std::string component() const override;
 
 protected:
-    WidgetController *m_controller;
-
     AABBox m_savedBox;
 
-    AABBox m_box;
-
     Vector3 m_world;
     Vector3 m_savedWorld;
     Vector3 m_position;
 
+    WidgetController *m_controller;
+
 };
 
 #endif // WIDGETTOOL_H
diff --git a/modules/uikit/includes/editor/widgetcontroller.h b/modules/uikit/includes/editor/widgetcontroller.h
index 92a84105f..548ec077f 100644
--- a/modules/uikit/includes/editor/widgetcontroller.h
+++ b/modules/uikit/includes/editor/widgetcontroller.h
@@ -12,18 +12,22 @@ class WidgetController : public CameraController {
     Q_OBJECT
 
 public:
-    explicit WidgetController(Object *rootObject);
+    explicit WidgetController(Widget *rootObject);
 
     void clear(bool signal);
 
     QList<Object *> selected() override;
-    WidgetTool::SelectList &selectList() { return m_selected; }
+    uint32_t selectedUuid() { return m_selected; }
+
+    Widget *root() const { return m_rootObject; }
 
     void selectActors(const std::list<uint32_t> &list);
 
     bool isDrag() const { return m_drag; }
     void setDrag(bool drag);
 
+    Vector2 screenSize() const { return m_screenSize; }
+
 signals:
     void sceneUpdated();
     void objectsSelected(QList<Object *> objects);
@@ -38,19 +42,27 @@ public slots:
 
     void update() override;
 
+    void cameraMove(const Vector3 &delta) override;
+
+    void cameraZoom(float delta) override;
+
     void select(Object &object) override;
 
-    Widget *getHoverWidget(float x, float y);
+    void resize(int32_t width, int32_t height) override;
 
 private:
-    WidgetTool::SelectList m_selected;
-
     std::list<uint32_t> m_objectsList;
 
-    Object *m_rootObject;
+    Vector3 m_lastZoom;
+
+    Widget *m_rootObject;
 
     EditorTool *m_widgetTool;
 
+    uint32_t m_selected;
+
+    int32_t m_zoom;
+
     bool m_canceled;
     bool m_drag;
 
diff --git a/modules/uikit/src/components/frame.cpp b/modules/uikit/src/components/frame.cpp
index c2ffd6fb4..537db5b28 100644
--- a/modules/uikit/src/components/frame.cpp
+++ b/modules/uikit/src/components/frame.cpp
@@ -52,9 +52,7 @@ Frame::Frame() :
     if(material) {
         m_material = material->createInstance();
 
-        Vector4 normCorners(m_borderRadius / m_meshSize.y);
-        m_material->setVector4(gBorderRadius, &normCorners);
-
+        m_material->setVector4(gBorderRadius, &m_borderRadius);
         m_material->setVector4(gTopColor, &m_topColor);
         m_material->setVector4(gRightColor, &m_rightColor);
         m_material->setVector4(gBottomColor, &m_bottomColor);
@@ -69,11 +67,13 @@ void Frame::draw(CommandBuffer &buffer) {
     if(m_material) {
         RectTransform *rect = rectTransform();
         Matrix4 m(rect->worldTransform());
+
+        Vector2 size(rect->size());
         Matrix4 s;
-        s[0] = m_meshSize.x;
-        s[5] = m_meshSize.y;
-        s[12] = m_meshSize.x * 0.5f;
-        s[13] = m_meshSize.y * 0.5f;
+        s[0] = size.x;
+        s[5] = size.y;
+        s[12] = size.x * 0.5f;
+        s[13] = size.y * 0.5f;
 
         m_material->setTransform(m * s);
 
@@ -143,7 +143,8 @@ Vector4 Frame::corners() const {
 void Frame::setCorners(Vector4 corners) {
     m_borderRadius = corners;
     if(m_material) {
-        Vector4 normCorners(m_borderRadius / m_meshSize.y);
+        RectTransform *rect = rectTransform();
+        Vector4 normCorners(m_borderRadius / rect->size().y);
         m_material->setVector4(gBorderRadius, &normCorners);
     }
 }
@@ -238,13 +239,11 @@ void Frame::setBorderColor(Vector4 color) {
 void Frame::boundChanged(const Vector2 &size) {
     Widget::boundChanged(size);
 
-    m_meshSize = size;
-
     if(m_material) {
-        Vector4 normCorners(m_borderRadius / m_meshSize.y);
+        Vector4 normCorners(m_borderRadius / size.y);
         m_material->setVector4(gBorderRadius, &normCorners);
 
-        Vector4 normBorders(rectTransform()->border() / m_meshSize.y);
+        Vector4 normBorders(rectTransform()->border() / size.y);
         m_material->setVector4(gBorderWidth, &normBorders);
     }
 }
diff --git a/modules/uikit/src/components/recttransform.cpp b/modules/uikit/src/components/recttransform.cpp
index 022064595..1512b4640 100644
--- a/modules/uikit/src/components/recttransform.cpp
+++ b/modules/uikit/src/components/recttransform.cpp
@@ -46,8 +46,7 @@ Vector2 RectTransform::size() const {
     Sets the \a size of the RectTransform.
 */
 void RectTransform::setSize(const Vector2 size) {
-    Vector2 s = RectTransform::size();
-    if(s != size) {
+    if(m_size != size) {
         if(abs(m_minAnchors.x - m_maxAnchors.x) <= EPSILON) {
             m_size.x = size.x - m_margin.y - m_margin.w;
         }
@@ -379,6 +378,8 @@ void RectTransform::recalcChilds() const {
         m_layout->invalidate();
         m_layout->update();
     }
+
+    m_dirty = true;
 }
 
 void RectTransform::recalcParent() {
diff --git a/modules/uikit/src/components/uiloader.cpp b/modules/uikit/src/components/uiloader.cpp
index 91d39f539..91141e197 100644
--- a/modules/uikit/src/components/uiloader.cpp
+++ b/modules/uikit/src/components/uiloader.cpp
@@ -171,11 +171,3 @@ void UiLoader::cleanHierarchy(Widget *widget) {
         delete it->actor();
     }
 }
-/*!
-    \internal
-*/
-void UiLoader::drawGizmos() {
-    AABBox box = m_transform->bound();
-    Gizmos::drawRectangle(box.center, Vector2(box.extent.x * 2.0f,
-                                              box.extent.y * 2.0f), Vector4(0.5f, 0.5f, 1.0f, 1.0f));
-}
diff --git a/modules/uikit/src/components/widget.cpp b/modules/uikit/src/components/widget.cpp
index b8700f349..74ea27ca3 100644
--- a/modules/uikit/src/components/widget.cpp
+++ b/modules/uikit/src/components/widget.cpp
@@ -317,16 +317,6 @@ void Widget::addStyleRules(const std::map<std::string, std::string> &rules, uint
         }
     }
 }
-/*!
-    \internal
-    Internal method to draw selected gizmos for the widget, such as a wireframe box.
-*/
-void Widget::drawGizmosSelected() {
-    static Vector4 color(0.5f, 1.0f, 0.5f, 1.0f);
-
-    AABBox box = m_transform->bound();
-    Gizmos::drawRectangle(box.center, Vector2(box.extent.x * 2.0f, box.extent.y * 2.0f), color);
-}
 /*!
     \internal
     Returns length for the stylesheet \a property.
diff --git a/modules/uikit/src/editor/tools/widgettool.cpp b/modules/uikit/src/editor/tools/widgettool.cpp
index 9718384bf..ec6dc77e1 100644
--- a/modules/uikit/src/editor/tools/widgettool.cpp
+++ b/modules/uikit/src/editor/tools/widgettool.cpp
@@ -4,7 +4,6 @@
 
 #include <actor.h>
 #include <transform.h>
-#include <camera.h>
 #include <renderable.h>
 
 #include <editor/viewport/handles.h>
@@ -14,10 +13,10 @@
 
 #include "../widgetcontroller.h"
 
-const Vector3 cornerA(20.0f,-10.0f, 0.0f);
-const Vector3 cornerB(10.0f,-20.0f, 0.0f);
-const Vector3 cornerC(20.0f, 10.0f, 0.0f);
-const Vector3 cornerD(10.0f, 20.0f, 0.0f);
+const Vector3 cornerA(10.0f, -5.0f, 0.0f);
+const Vector3 cornerB( 5.0f,-10.0f, 0.0f);
+const Vector3 cornerC(10.0f,  5.0f, 0.0f);
+const Vector3 cornerD( 5.0f, 10.0f, 0.0f);
 
 WidgetTool::WidgetTool(WidgetController *controller) :
         m_controller(controller) {
@@ -29,28 +28,23 @@ void WidgetTool::beginControl() {
 
     m_propertiesCache.clear();
 
-    for(auto &it : m_controller->selectList()) {
-        Transform *t = it.object->transform();
-        it.position = t->position();
-        it.scale    = t->scale();
-        it.euler    = t->rotation();
-        it.quat     = t->quaternion();
-
-        VariantMap components;
-        for(auto &child : it.object->getChildren()) {
-            Component *component = dynamic_cast<Component *>(child);
-            if(component) {
-                VariantMap properies;
-                const MetaObject *meta = component->metaObject();
-                for(int i = 0; i < meta->propertyCount(); i++) {
-                    MetaProperty property = meta->property(i);
-                    properies[property.name()] = property.read(component);
-                }
-                components[std::to_string(component->uuid())] = properies;
+    Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
+
+    VariantMap components;
+    for(auto &child : actor->getChildren()) {
+        Component *component = dynamic_cast<Component *>(child);
+        if(component) {
+            VariantMap properies;
+            const MetaObject *meta = component->metaObject();
+            for(int i = 0; i < meta->propertyCount(); i++) {
+                MetaProperty property = meta->property(i);
+                properies[property.name()] = property.read(component);
             }
+            components[std::to_string(component->uuid())] = properies;
         }
-        m_propertiesCache.push_back(components);
     }
+    m_propertiesCache.push_back(components);
+
 
     m_position = objectPosition();
     m_savedWorld = m_world;
@@ -61,29 +55,27 @@ void WidgetTool::endControl() {
 
     auto cache = m_propertiesCache.begin();
 
-    for(auto &it : m_controller->selectList()) {
-        VariantMap components = (*cache).toMap();
-        for(auto &child : it.object->getChildren()) {
+    Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
 
-            Component *component = dynamic_cast<Component *>(child);
-            if(component) {
-                VariantMap properties = components[std::to_string(component->uuid())].toMap();
-                const MetaObject *meta = component->metaObject();
-                for(int i = 0; i < meta->propertyCount(); i++) {
-                    MetaProperty property = meta->property(i);
+    VariantMap components = (*cache).toMap();
+    for(auto &child : actor->getChildren()) {
 
-                    Variant value = property.read(component);
-                    Variant data = properties[property.name()];
-                    if(value != data) {
-                        property.write(component, data);
+        Component *component = dynamic_cast<Component *>(child);
+        if(component) {
+            VariantMap properties = components[std::to_string(component->uuid())].toMap();
+            const MetaObject *meta = component->metaObject();
+            for(int i = 0; i < meta->propertyCount(); i++) {
+                MetaProperty property = meta->property(i);
 
-                        UndoManager::instance()->push(new ChangeProperty({component}, property.name(), value, m_controller, "", UndoManager::instance()->group()));
-                    }
+                Variant value = property.read(component);
+                Variant data = properties[property.name()];
+                if(value != data) {
+                    property.write(component, data);
+
+                    UndoManager::instance()->push(new ChangeProperty({component}, property.name(), value, m_controller, "", UndoManager::instance()->group()));
                 }
             }
         }
-
-        ++cache;
     }
 
     UndoManager::instance()->endGroup();
@@ -91,110 +83,146 @@ void WidgetTool::endControl() {
 
 void WidgetTool::cancelControl() {
     auto cache = m_propertiesCache.begin();
-    for(auto &it : m_controller->selectList()) {
-        VariantMap components = (*cache).toMap();
-        for(auto &child : it.object->getChildren()) {
-            Component *component = dynamic_cast<Component *>(child);
-            if(component) {
-                VariantMap properties = components[std::to_string(component->uuid())].toMap();
-                const MetaObject *meta = component->metaObject();
-                for(int i = 0; i < meta->propertyCount(); i++) {
-                    MetaProperty property = meta->property(i);
-                    property.write(component, properties[property.name()]);
-                }
+
+    Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
+
+    VariantMap components = (*cache).toMap();
+    for(auto &child : actor->getChildren()) {
+        Component *component = dynamic_cast<Component *>(child);
+        if(component) {
+            VariantMap properties = components[std::to_string(component->uuid())].toMap();
+            const MetaObject *meta = component->metaObject();
+            for(int i = 0; i < meta->propertyCount(); i++) {
+                MetaProperty property = meta->property(i);
+                property.write(component, properties[property.name()]);
+            }
+        }
+    }
+}
+
+Vector3 WidgetTool::recalcPosition(RectTransform *rect, RectTransform *root) const {
+    Vector3 result;
+
+    RectTransform *it = rect;
+    while(it && it != root) {
+        result += it->position();
+
+        RectTransform *parentRect = dynamic_cast<RectTransform *>(it->parentTransform());
+        if(parentRect) {
+            Vector2 anchors(it->minAnchors() + it->maxAnchors());
+            Vector2 parentCenter(anchors * parentRect->size() * 0.5f);
+
+            float x;
+            if(abs(it->minAnchors().x - it->maxAnchors().x) > EPSILON) { // fit to parent
+                result.x += parentRect->size().x * it->minAnchors().x + it->margin().w;
+            } else {
+                result.x += parentCenter.x - it->size().x * it->pivot().x + it->margin().w;
+            }
+
+            float y;
+            if(abs(it->minAnchors().y - it->maxAnchors().y) > EPSILON) { // fit to parent
+                result.y += parentRect->size().y * it->minAnchors().y + it->margin().z;
+            } else {
+                result.y += parentCenter.y - it->size().y * it->pivot().y + it->margin().z;
             }
         }
 
-        ++cache;
+        it = parentRect;
     }
+
+    return result;
 }
 
 void WidgetTool::update(bool pivot, bool local, bool snap) {
     EditorTool::update(pivot, local, snap);
 
-    RectTransform *rect = static_cast<RectTransform *>(m_controller->selectList().front().object->transform());
+    Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
+    RectTransform *rect = static_cast<RectTransform *>(actor->transform());
 
+    // Anchor cross
     RectTransform *parent = dynamic_cast<RectTransform *>(rect->parentTransform());
-    if(parent) {
-        AABBox bb(parent->bound());
+    if(parent == nullptr) {
+        return;
+    }
 
-        Vector2 minAnchor = rect->minAnchors();
-        Vector2 maxAnchor = rect->maxAnchors();
+    Widget *root = m_controller->root();
+    RectTransform *rootRect(root->rectTransform());
 
-        Vector3 lt(bb.center.x - ((0.5f - minAnchor.x) * bb.extent.x * 2.0f),
-                   bb.center.y + ((maxAnchor.y - 0.5f) * bb.extent.y * 2.0f), 0.0f);
+    Vector3 size(parent->size(), 0.0f);
+    Vector3 center(recalcPosition(parent, rootRect) + size * 0.5f);
 
-        Vector3 lb(bb.center.x - ((0.5f - minAnchor.x) * bb.extent.x * 2.0f),
-                   bb.center.y - ((0.5f - minAnchor.y) * bb.extent.y * 2.0f), 0.0f);
+    Vector2 minAnchor(rect->minAnchors());
+    Vector2 maxAnchor(rect->maxAnchors());
 
-        Vector3 rt(bb.center.x + ((maxAnchor.x - 0.5f) * bb.extent.x * 2.0f),
-                   bb.center.y + ((maxAnchor.y - 0.5f) * bb.extent.y * 2.0f), 0.0f);
+    Vector3 lt(center.x - (0.5f - minAnchor.x) * size.x,
+               center.y + (maxAnchor.y - 0.5f) * size.y, 0.0f);
 
-        Vector3 rb(bb.center.x + ((maxAnchor.x - 0.5f) * bb.extent.x * 2.0f),
-                   bb.center.y - ((0.5f - minAnchor.y) * bb.extent.y * 2.0f), 0.0f);
+    Vector3 lb(center.x - (0.5f - minAnchor.x) * size.x,
+               center.y - (0.5f - minAnchor.y) * size.y, 0.0f);
 
-        Vector3Vector points = {lt, lt - cornerA, lt - cornerB,
-                                lb, lb - cornerC, lb - cornerD,
-                                rt, rt + cornerC, rt + cornerD,
-                                rb, rb + cornerA, rb + cornerB};
-        IndexVector indices = {0, 1, 1, 2, 2, 0,
-                               3, 4, 4, 5, 5, 3,
-                               6, 7, 7, 8, 8, 6,
-                               9,10,10,11,11, 9};
+    Vector3 rt(center.x + (maxAnchor.x - 0.5f) * size.x,
+               center.y + (maxAnchor.y - 0.5f) * size.y, 0.0f);
 
-        Gizmos::drawLines(points, indices, Vector4(1.0f));
-    }
+    Vector3 rb(center.x + (maxAnchor.x - 0.5f) * size.x,
+               center.y - (0.5f - minAnchor.y) * size.y, 0.0f);
 
-    m_box = rect->bound();
-    if(!m_box.isValid()) {
-        return;
-    }
+    Vector3Vector points = {lt, lt - cornerA, lt - cornerB,
+                            lb, lb - cornerC, lb - cornerD,
+                            rt, rt + cornerC, rt + cornerD,
+                            rb, rb + cornerA, rb + cornerB};
+    IndexVector indices = {0, 1, 1, 2, 2, 0,
+                           3, 4, 4, 5, 5, 3,
+                           6, 7, 7, 8, 8, 6,
+                           9,10,10,11,11, 9};
+
+    Gizmos::drawLines(points, indices, Vector4(1.0f));
+
+    Vector3 boxSize(rect->size(), 0.0f);
+    Vector3 boxCenter(recalcPosition(rect, rootRect) + boxSize * Vector3(rect->pivot(), 0.0f));
 
     bool isDrag = m_controller->isDrag();
-    if(!isDrag) {
-        m_position = objectPosition();
-    }
 
     int axis;
-    m_world = Handles::rectTool(m_box.center, m_box.extent * 2.0f, axis, true, isDrag);
+    m_world = Handles::rectTool(boxCenter, boxSize, axis, true, isDrag);
 
     if(isDrag) {
         Vector3 delta(m_world - m_savedWorld);
         if(delta.length() > 1.0f) {
-            for(const auto &it : qAsConst(m_controller->selectList())) {
-                RectTransform *rect = static_cast<RectTransform *>(it.object->transform());
+            Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
+            RectTransform *rect = static_cast<RectTransform *>(actor->transform());
 
-                Vector3 p(rect->position());
-                Vector2 position(p.x, p.y);
-                Vector2 size(rect->size());
-                Vector2 pivot(rect->pivot());
+            Vector3 p(rect->position());
+            Vector2 position(p.x, p.y);
+            Vector2 size(rect->size());
+            Vector2 pivot(rect->pivot());
 
-                Vector2 min(position - (size * pivot));
-                Vector2 max(position + (size * (Vector2(1.0f) - pivot)));
+            Vector2 min(position - (size * pivot));
+            Vector2 max(position + (size * (Vector2(1.0f) - pivot)));
 
-                if(Handles::s_Axes & Handles::TOP) {
-                    max.y += delta.y;
-                }
-                if(Handles::s_Axes & Handles::BOTTOM) {
-                    min.y += delta.y;
-                }
-                if(Handles::s_Axes & Handles::LEFT) {
-                    min.x += delta.x;
-                }
-                if(Handles::s_Axes & Handles::RIGHT) {
-                    max.x += delta.x;
-                }
+            if(Handles::s_Axes & Handles::TOP) {
+                max.y += delta.y;
+            }
+            if(Handles::s_Axes & Handles::BOTTOM) {
+                min.y += delta.y;
+            }
+            if(Handles::s_Axes & Handles::LEFT) {
+                min.x += delta.x;
+            }
+            if(Handles::s_Axes & Handles::RIGHT) {
+                max.x += delta.x;
+            }
 
-                size = Vector2(MAX(max.x - min.x, 0.0f), MAX(max.y - min.y, 0.0f));
-                rect->setSize(size);
+            size = Vector2(MAX(max.x - min.x, 0.0f), MAX(max.y - min.y, 0.0f));
+            rect->setSize(size);
 
-                if(rect->parentTransform()) {
-                    rect->setPosition(Vector3(min + size * pivot, p.z));
-                }
+            if(rect->parentTransform()) {
+                rect->setPosition(Vector3(min + size * pivot, p.z));
             }
-        }
 
-        m_savedWorld = m_world;
+            m_savedWorld = m_world;
+        }
+    } else {
+        m_position = objectPosition();
     }
 
     Qt::CursorShape shape = Qt::ArrowCursor;
@@ -230,36 +258,6 @@ std::string WidgetTool::component() const {
 }
 
 Vector3 WidgetTool::objectPosition() {
-    if(m_controller->selectList().size() == 1) {
-        return m_controller->selectList().front().object->transform()->worldPosition();
-    }
-    return objectBound().center;
-}
-
-AABBox WidgetTool::objectBound() {
-    AABBox result;
-    result.extent = Vector3(-1.0f);
-    if(!m_controller->selectList().empty()) {
-        bool first = true;
-        for(auto &it : m_controller->selectList()) {
-            if(it.renderable == nullptr) {
-                it.renderable = it.object->getComponent<Renderable>();
-            }
-            if(it.renderable) {
-                if(first) {
-                    result = it.renderable->bound();
-                    first = false;
-                } else {
-                    result.encapsulate(it.renderable->bound());
-                }
-            } else {
-                if(first) {
-                    result.center = it.object->transform()->worldPosition();
-                } else {
-                    result.encapsulate(it.object->transform()->worldPosition());
-                }
-            }
-        }
-    }
-    return result;
+    Actor *actor = static_cast<Actor *>(Engine::findObject(m_controller->selectedUuid()));
+    return actor->transform()->worldPosition();
 }
diff --git a/modules/uikit/src/editor/uiedit.cpp b/modules/uikit/src/editor/uiedit.cpp
index 3c51fa2af..8fb2a4947 100644
--- a/modules/uikit/src/editor/uiedit.cpp
+++ b/modules/uikit/src/editor/uiedit.cpp
@@ -38,16 +38,16 @@ UiEdit::UiEdit() :
         ui(new Ui::UiEdit),
         m_world(Engine::objectCreate<World>("World")),
         m_scene(Engine::objectCreate<Scene>("Scene", m_world)),
-        m_controller(new WidgetController(m_scene)),
+        m_controller(nullptr),
         m_lastCommand(nullptr) {
 
     Actor *actor = Engine::composeActor(gUiLoader, "Screen", m_scene);
     m_loader = actor->getComponent<UiLoader>();
 
-    m_loader->rectTransform()->setSize(Vector2(1920, 1080));
-
     ui->setupUi(this);
 
+    m_controller = new WidgetController(m_loader);
+
     m_controller->doRotation(Vector3());
     m_controller->setGridAxis(CameraController::Axis::Z);
     m_controller->blockRotations(true);
@@ -60,8 +60,7 @@ UiEdit::UiEdit() :
 
     Camera *camera = m_controller->camera();
     if(camera) {
-        camera->setOrthoSize(1000);
-
+        camera->setScreenSpace(true);
         Vector2 size = m_loader->rectTransform()->size();
         camera->transform()->setPosition(Vector3(size.x * 0.5f, size.y * 0.5f, 1.0f));
     }
diff --git a/modules/uikit/src/editor/widgetcontroller.cpp b/modules/uikit/src/editor/widgetcontroller.cpp
index 6baf82aeb..ae60a0b07 100644
--- a/modules/uikit/src/editor/widgetcontroller.cpp
+++ b/modules/uikit/src/editor/widgetcontroller.cpp
@@ -7,16 +7,17 @@
 
 #include <components/camera.h>
 #include <components/actor.h>
-#include <components/transform.h>
 
 #include <editor/viewport/handles.h>
-
+#include <gizmos.h>
 #include <input.h>
 
-WidgetController::WidgetController(Object *rootObject) :
+WidgetController::WidgetController(Widget *rootObject) :
         CameraController(),
         m_rootObject(rootObject),
         m_widgetTool(new WidgetTool(this)),
+        m_selected(0),
+        m_zoom(1),
         m_canceled(false),
         m_drag(false) {
 
@@ -24,7 +25,7 @@ WidgetController::WidgetController(Object *rootObject) :
 }
 
 void WidgetController::clear(bool signal) {
-    m_selected.clear();
+    m_selected = 0;
     if(signal) {
         emit objectsSelected(selected());
     }
@@ -32,9 +33,12 @@ void WidgetController::clear(bool signal) {
 
 QList<Object *> WidgetController::selected() {
     QList<Object *> result;
-    for(auto &it : m_selected) {
-        result.push_back(it.object);
+
+    Actor *actor = dynamic_cast<Actor *>(Engine::findObject(m_selected));
+    if(actor) {
+        result.push_back(actor);
     }
+
     return result;
 }
 
@@ -42,28 +46,32 @@ void WidgetController::select(Object &object) {
     m_objectsList = {object.uuid()};
 }
 
+void WidgetController::resize(int32_t width, int32_t height) {
+    if(m_screenSize != Vector2(width, height)) {
+        CameraController::resize(width, height);
+
+        cameraZoom(0.0f);
+    }
+}
+
 void WidgetController::selectActors(const std::list<uint32_t> &list) {
     for(auto it : list) {
         Actor *actor = dynamic_cast<Actor *>(Engine::findObject(it));
         if(actor) {
-            m_selected.push_back({actor->uuid(), actor});
+            m_selected = it;
+            break;
         }
     }
     emit objectsSelected(selected());
 }
 
 void WidgetController::onSelectActor(const std::list<uint32_t> &list, bool additive) {
-    bool changed = list.size() != m_selected.size();
+    bool changed = false;
     if(!changed) {
         for(auto it : list) {
-            bool found = false;
-            for(auto &s : m_selected) {
-                if(it == s.object->uuid()) {
-                    found = true;
-                    break;
-                }
-            }
-            if(!found) {
+            if(it == m_selected) {
+                break;
+            } else {
                 changed = true;
             }
         }
@@ -75,9 +83,7 @@ void WidgetController::onSelectActor(const std::list<uint32_t> &list, bool addit
 
     std::list<uint32_t> local = list;
     if(additive) {
-        for(auto &it : m_selected) {
-            local.push_back(it.object->uuid());
-        }
+        local.push_back(m_selected);
     }
 
     UndoManager::instance()->push(new SelectObjects(local, this));
@@ -92,13 +98,18 @@ void WidgetController::onSelectActor(const QList<Object *> &list, bool additive)
 }
 
 void WidgetController::drawHandles() {
-    CameraController::drawHandles();
-
     Vector4 pos(Input::mousePosition());
     Handles::s_Mouse = Vector2(pos.z, pos.w);
     Handles::s_Screen = m_screenSize;
 
-    if(!m_selected.empty()) {
+    RectTransform *rect = m_rootObject->rectTransform();
+
+    Vector2 size(rect->size());
+    Vector3 position(size * rect->pivot(), 0.0f);
+
+    Gizmos::drawRectangle(position, size, Handles::s_yColor);
+
+    if(m_selected != 0) {
         m_widgetTool->update(false, true, Input::isKey(Input::KEY_LEFT_CONTROL));
     }
 }
@@ -109,7 +120,14 @@ void WidgetController::update() {
 
     CameraController::update();
 
-    Widget *focusWidget = getHoverWidget(pos.x, pos.y);
+    Widget *focusWidget = nullptr;
+
+    for(auto it : m_rootObject->findChildren<Widget *>()) {
+        RectTransform *rect = it->rectTransform();
+        if(rect && rect->isHovered(pos.x, pos.y)) {
+            focusWidget = it;
+        }
+    }
 
     if(Input::isMouseButtonUp(Input::MOUSE_LEFT)) {
         if(!m_drag) {
@@ -137,7 +155,7 @@ void WidgetController::update() {
         emit sceneUpdated();
     }
 
-    if(!m_selected.empty()) {
+    if(m_selected != 0) {
         if(Input::isMouseButtonDown(Input::MOUSE_LEFT) && Handles::s_Axes) {
             setDrag(true);
         }
@@ -154,7 +172,44 @@ void WidgetController::update() {
     } else {
         emit unsetCursor();
     }
+}
 
+void WidgetController::cameraMove(const Vector3 &delta) {
+    Transform *rootTransform = m_rootObject->transform();
+    rootTransform->setPosition(rootTransform->position() + Vector3(m_delta, 0.0f));
+
+    Transform *cameraTransform = m_activeCamera->transform();
+    cameraTransform->setPosition(cameraTransform->position() - delta * m_activeCamera->orthoSize());
+}
+
+void WidgetController::cameraZoom(float delta) {
+    int zoom = m_zoom;
+    if(delta != 0.0f) {
+        zoom += (delta > 0) ? -1 : 1;
+        zoom = CLAMP(zoom, 1, 10);
+    }
+
+    m_zoom = zoom;
+
+    RectTransform *rect = static_cast<RectTransform *>(m_rootObject->transform());
+    Vector3 world(m_activeCamera->unproject(rect->position()));
+
+    Transform *cameraTransform = m_activeCamera->transform();
+    Vector3 worldCamera(m_activeCamera->unproject(cameraTransform->position()));
+
+    float scale = 1.1f - ((float)m_zoom / 10.0f);
+    m_activeCamera->setOrthoSize(m_screenSize.y / scale);
+
+    float width = m_screenSize.x / scale;
+    float height = m_screenSize.y / scale;
+
+    Vector3 center((width - m_screenSize.x) * 0.5f, (height - m_screenSize.y) * 0.5f, 0.0f);
+    cameraTransform->setPosition(cameraTransform->position() - (center - m_lastZoom));
+
+    m_lastZoom = center;
+
+    rect->setPosition(Vector3(m_activeCamera->project(world), 0.0f));
+    rect->setScale(Vector3(scale, scale, 1.0f));
 }
 
 void WidgetController::setDrag(bool drag) {
@@ -164,22 +219,6 @@ void WidgetController::setDrag(bool drag) {
     m_drag = drag;
 }
 
-Widget *WidgetController::getHoverWidget(float x, float y) {
-    Widget *result = nullptr;
-
-    for(auto it : m_rootObject->findChildren<Widget *>()) {
-        if(it->actor()->parent() == m_rootObject) {
-            continue;
-        }
-        RectTransform *rect = it->rectTransform();
-        if(rect && rect->isHovered(x, y)) {
-            result = it;
-        }
-    }
-
-    return result;
-}
-
 SelectObjects::SelectObjects(const std::list<uint32_t> &objects, WidgetController *ctrl, const QString &name, QUndoCommand *group) :
         UndoObject(ctrl, name, group),
         m_objects(objects) {
@@ -208,7 +247,6 @@ ChangeProperty::ChangeProperty(const QList<Object *> &objects, const QString &pr
     for(auto it : objects) {
         m_objects.push_back(it->uuid());
     }
-
 }
 void ChangeProperty::undo() {
     ChangeProperty::redo();
diff --git a/modules/uikit/uikit.qbs b/modules/uikit/uikit.qbs
index ae41cf6ad..933af7d4d 100644
--- a/modules/uikit/uikit.qbs
+++ b/modules/uikit/uikit.qbs
@@ -37,8 +37,8 @@ Project {
             sources.push("includes/converters/*.h")
             sources.push("src/editor/**/*.cpp")
             sources.push("includes/editor/**/*.h")
-            sources.push("src/editor/**/*.ui")
-            sources.push("src/editor/**/*.qrc")
+            sources.push("src/editor/*.ui")
+            sources.push("src/editor/*.qrc")
             return sources
         }
         Depends { name: "cpp" }
diff --git a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
index 4c162b1ae..697010d95 100644
--- a/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
+++ b/worldeditor/src/screens/objecthierarchy/hierarchybrowser.cpp
@@ -369,10 +369,10 @@ void HierarchyBrowser::on_treeView_clicked(const QModelIndex &index) {
 
             emit objectsSelected(QList<Object *>(set.begin(), set.end()), false);
         } else if(index.column() == 2) {
-            actor->setHideFlags(actor->hideFlags() ^ Actor::ENABLE);
+            actor->setFlags(actor->flags() ^ Actor::Enable);
             onUpdated();
         } else if(index.column() == 3) {
-            actor->setHideFlags(actor->hideFlags() ^ Actor::SELECTABLE);
+            actor->setFlags(actor->flags() ^ Actor::Selectable);
             onUpdated();
         }
     }
diff --git a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
index 324175d67..4401f20cf 100644
--- a/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
+++ b/worldeditor/src/screens/objecthierarchy/objecthierarchymodel.cpp
@@ -68,8 +68,8 @@ QVariant ObjectHierarchyModel::data(const QModelIndex &index, int role) const {
             if(actor) {
                 switch(index.column()) {
                     case 0: return actor->isInstance() ? m_prefab : m_actor;
-                    case 2: return (actor->hideFlags() & Actor::ENABLE) ? m_visible : m_invisible;
-                    case 3: return (actor->hideFlags() & Actor::SELECTABLE) ? QVariant() : m_selectDisable;
+                    case 2: return (actor->flags() & Actor::Enable) ? m_visible : m_invisible;
+                    case 3: return (actor->flags() & Actor::Selectable) ? QVariant() : m_selectDisable;
                     default: break;
                 }
             }
diff --git a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
index 73741b2ce..7bba2e323 100644
--- a/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
+++ b/worldeditor/src/screens/scenecomposer/objectcontroller.cpp
@@ -89,7 +89,7 @@ class ViewportRaycast : public PipelineTask {
         buffer->setRenderTarget(m_resultTarget);
 
         if(!m_controller->isPickingBlocked() && !m_controller->isPickingOverlaped()) {
-            m_context->drawRenderers(m_context->culledComponents(), CommandBuffer::RAYCAST, Actor::SELECTABLE);
+            m_context->drawRenderers(m_context->culledComponents(), CommandBuffer::RAYCAST, Actor::Selectable);
 
             Camera *activeCamera = m_controller->activeCamera();