diff --git a/src/frontend/InventoryView.cpp b/src/frontend/InventoryView.cpp
index 99d7722f..869a227e 100644
--- a/src/frontend/InventoryView.cpp
+++ b/src/frontend/InventoryView.cpp
@@ -11,7 +11,6 @@
 #include "../graphics/core/GfxContext.h"
 #include "../graphics/core/Shader.h"
 #include "../graphics/render/BlocksPreview.h"
-#include "../graphics/ui/elements/controls.h"
 #include "../items/Inventories.h"
 #include "../items/Inventory.h"
 #include "../items/ItemDef.h"
diff --git a/src/frontend/InventoryView.h b/src/frontend/InventoryView.h
index 8cc76a03..9bb86e7b 100644
--- a/src/frontend/InventoryView.h
+++ b/src/frontend/InventoryView.h
@@ -6,8 +6,7 @@
 #include <glm/glm.hpp>
 
 #include "../graphics/ui/elements/UINode.h"
-#include "../graphics/ui/elements/Container.hpp"
-#include "../graphics/ui/elements/controls.h"
+#include "../graphics/ui/elements/layout/Container.hpp"
 #include "../items/ItemStack.h"
 #include "../typedefs.h"
 
diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp
index 89bdb28e..7f5c7ecd 100644
--- a/src/frontend/debug_panel.cpp
+++ b/src/frontend/debug_panel.cpp
@@ -6,7 +6,10 @@
 #include "../delegates.h"
 #include "../engine.h"
 #include "../graphics/core/Mesh.h"
-#include "../graphics/ui/elements/controls.h"
+#include "../graphics/ui/elements/control/CheckBox.hpp"
+#include "../graphics/ui/elements/control/TextBox.hpp"
+#include "../graphics/ui/elements/control/TrackBar.hpp"
+#include "../graphics/ui/elements/control/InputBindBox.hpp"
 #include "../graphics/render/WorldRenderer.h"
 #include "../objects/Player.h"
 #include "../physics/Hitbox.h"
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index d5c14111..aa2550d5 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -15,10 +15,10 @@
 #include "../graphics/core/Texture.h"
 #include "../graphics/render/BlocksPreview.h"
 #include "../graphics/render/WorldRenderer.h"
-#include "../graphics/ui/elements/controls.h"
 #include "../graphics/ui/elements/UINode.h"
-#include "../graphics/ui/elements/Menu.hpp"
-#include "../graphics/ui/elements/Plotter.hpp"
+#include "../graphics/ui/elements/layout/Menu.hpp"
+#include "../graphics/ui/elements/layout/Panel.hpp"
+#include "../graphics/ui/elements/display/Plotter.hpp"
 #include "../graphics/ui/GUI.h"
 #include "../items/Inventories.h"
 #include "../items/Inventory.h"
diff --git a/src/frontend/menu/menu.cpp b/src/frontend/menu/menu.cpp
index 5c11b629..0d05df91 100644
--- a/src/frontend/menu/menu.cpp
+++ b/src/frontend/menu/menu.cpp
@@ -11,8 +11,9 @@
 #include "../../interfaces/Task.h"
 #include "../../graphics/ui/GUI.h"
 #include "../../graphics/ui/gui_util.h"
-#include "../../graphics/ui/elements/Menu.hpp"
-#include "../../graphics/ui/elements/controls.h"
+#include "../../graphics/ui/elements/layout/Menu.hpp"
+#include "../../graphics/ui/elements/display/Label.hpp"
+#include "../../graphics/ui/elements/control/Button.hpp"
 #include "../screens.h"
 #include "../UiDocument.h"
 #include "../../logic/scripting/scripting.h"
diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp
index 5f3cbee3..18f0762a 100644
--- a/src/frontend/screens.cpp
+++ b/src/frontend/screens.cpp
@@ -10,7 +10,7 @@
 #include "../graphics/core/Shader.h"
 #include "../graphics/core/TextureAnimation.h"
 #include "../graphics/render/WorldRenderer.h"
-#include "../graphics/ui/elements/Menu.hpp"
+#include "../graphics/ui/elements/layout/Menu.hpp"
 #include "../graphics/ui/GUI.h"
 #include "../logic/ChunksController.h"
 #include "../logic/LevelController.h"
diff --git a/src/graphics/ui/GUI.cpp b/src/graphics/ui/GUI.cpp
index 4799d344..0549d569 100644
--- a/src/graphics/ui/GUI.cpp
+++ b/src/graphics/ui/GUI.cpp
@@ -1,6 +1,6 @@
 #include "GUI.h"
 #include "elements/UINode.h"
-#include "elements/Menu.hpp"
+#include "elements/layout/Menu.hpp"
 
 #include <iostream>
 #include <algorithm>
diff --git a/src/graphics/ui/elements/UINode.cpp b/src/graphics/ui/elements/UINode.cpp
index c3a7501c..dc1436e7 100644
--- a/src/graphics/ui/elements/UINode.cpp
+++ b/src/graphics/ui/elements/UINode.cpp
@@ -1,6 +1,6 @@
 #include "UINode.h"
 
-#include "Container.hpp"
+#include "layout/Container.hpp"
 #include "../../core/Batch2D.h"
 
 using gui::UINode;
diff --git a/src/graphics/ui/elements/control/Button.cpp b/src/graphics/ui/elements/control/Button.cpp
new file mode 100644
index 00000000..a0ea5439
--- /dev/null
+++ b/src/graphics/ui/elements/control/Button.cpp
@@ -0,0 +1,98 @@
+#include "Button.hpp"
+
+#include "../display/Label.hpp"
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+
+using namespace gui;
+
+Button::Button(std::shared_ptr<UINode> content, glm::vec4 padding)
+    : Panel(glm::vec2(), padding, 0) {
+    glm::vec4 margin = getMargin();
+    setSize(content->getSize()+
+            glm::vec2(padding[0]+padding[2]+margin[0]+margin[2],
+                      padding[1]+padding[3]+margin[1]+margin[3]));
+    add(content);
+    setScrollable(false);
+    setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
+    setPressedColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.95f));
+    content->setInteractive(false);
+}
+
+Button::Button(
+    std::wstring text, 
+    glm::vec4 padding, 
+    onaction action,
+    glm::vec2 size
+) : Panel(size, padding, 0) 
+{
+    if (size.y < 0.0f) {
+        size = glm::vec2(
+            glm::max(padding.x + padding.z + text.length()*8, size.x),
+            glm::max(padding.y + padding.w + 16, size.y)
+        );
+    }
+    setSize(size);
+
+    if (action) {
+        listenAction(action);
+    }
+    setScrollable(false);
+
+    label = std::make_shared<Label>(text);
+    label->setAlign(Align::center);
+    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    label->setInteractive(false);
+    add(label);
+    setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
+    setPressedColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.95f));
+}
+
+void Button::setText(std::wstring text) {
+    if (label) {
+        label->setText(text);
+    }
+}
+
+std::wstring Button::getText() const {
+    if (label) {
+        return label->getText();
+    }
+    return L"";
+}
+
+Button* Button::textSupplier(wstringsupplier supplier) {
+    if (label) {
+        label->textSupplier(supplier);
+    }
+    return this;
+}
+
+void Button::refresh() {
+    Panel::refresh();
+    if (label) {
+        label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    }
+}
+
+void Button::drawBackground(const GfxContext* pctx, Assets* assets) {
+    glm::vec2 pos = calcPos();
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+    batch->setColor(isPressed() ? pressedColor : (hover ? hoverColor : color));
+    batch->rect(pos.x, pos.y, size.x, size.y);
+}
+
+void Button::setTextAlign(Align align) {
+    if (label) {
+        label->setAlign(align);
+        refresh();
+    }
+}
+
+Align Button::getTextAlign() const {
+    if (label) {
+        return label->getAlign();
+    }
+    return Align::left;
+}
diff --git a/src/graphics/ui/elements/control/Button.hpp b/src/graphics/ui/elements/control/Button.hpp
new file mode 100644
index 00000000..9fa559dd
--- /dev/null
+++ b/src/graphics/ui/elements/control/Button.hpp
@@ -0,0 +1,35 @@
+#ifndef GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
+#define GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
+
+#include "../layout/Panel.hpp"
+
+namespace gui {
+    class Label;
+
+    class Button : public Panel {
+    protected:
+        std::shared_ptr<Label> label = nullptr;
+    public:
+        Button(std::shared_ptr<UINode> content, 
+               glm::vec4 padding=glm::vec4(2.0f));
+               
+        Button(std::wstring text, 
+               glm::vec4 padding,
+               onaction action,
+               glm::vec2 size=glm::vec2(-1));
+
+        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+
+        virtual Align getTextAlign() const;
+        virtual void setTextAlign(Align align);
+
+        virtual void setText(std::wstring text);
+        virtual std::wstring getText() const;
+
+        virtual Button* textSupplier(wstringsupplier supplier);
+
+        virtual void refresh() override;
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_BUTTON_HPP_
diff --git a/src/graphics/ui/elements/control/CheckBox.cpp b/src/graphics/ui/elements/control/CheckBox.cpp
new file mode 100644
index 00000000..31eb7f9f
--- /dev/null
+++ b/src/graphics/ui/elements/control/CheckBox.cpp
@@ -0,0 +1,55 @@
+#include "CheckBox.hpp"
+
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../display/Label.hpp"
+
+using namespace gui;
+
+CheckBox::CheckBox(bool checked) : UINode(glm::vec2(32.0f)), checked(checked) {
+    setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
+}
+
+void CheckBox::draw(const GfxContext* pctx, Assets* assets) {
+    if (supplier) {
+        checked = supplier();
+    }
+    glm::vec2 pos = calcPos();
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+    batch->setColor(checked ? checkColor : (hover ? hoverColor : color));
+    batch->rect(pos.x, pos.y, size.x, size.y);
+}
+
+void CheckBox::mouseRelease(GUI*, int x, int y) {
+    checked = !checked;
+    if (consumer) {
+        consumer(checked);
+    }
+}
+
+void CheckBox::setSupplier(boolsupplier supplier) {
+    this->supplier = supplier;
+}
+
+void CheckBox::setConsumer(boolconsumer consumer) {
+    this->consumer = consumer;
+}
+
+CheckBox* CheckBox::setChecked(bool flag) {
+    checked = flag;
+    return this;
+}
+
+FullCheckBox::FullCheckBox(std::wstring text, glm::vec2 size, bool checked)
+    : Panel(size), 
+      checkbox(std::make_shared<CheckBox>(checked)){
+    setColor(glm::vec4(0.0f));
+    setOrientation(Orientation::horizontal);
+
+    add(checkbox);
+
+    auto label = std::make_shared<Label>(text); 
+    label->setMargin(glm::vec4(5.f, 5.f, 0.f, 0.f));
+    add(label);
+}
diff --git a/src/graphics/ui/elements/control/CheckBox.hpp b/src/graphics/ui/elements/control/CheckBox.hpp
new file mode 100644
index 00000000..577677fd
--- /dev/null
+++ b/src/graphics/ui/elements/control/CheckBox.hpp
@@ -0,0 +1,57 @@
+#ifndef GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
+#define GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
+
+#include "../layout/Panel.hpp"
+
+namespace gui {
+    class CheckBox : public UINode {
+    protected:
+        glm::vec4 hoverColor {0.05f, 0.1f, 0.2f, 0.75f};
+        glm::vec4 checkColor {1.0f, 1.0f, 1.0f, 0.4f};
+        boolsupplier supplier = nullptr;
+        boolconsumer consumer = nullptr;
+        bool checked = false;
+    public:
+        CheckBox(bool checked=false);
+
+        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+
+        virtual void mouseRelease(GUI*, int x, int y) override;
+
+        virtual void setSupplier(boolsupplier supplier);
+        virtual void setConsumer(boolconsumer consumer);
+
+        virtual CheckBox* setChecked(bool flag);
+
+        virtual bool isChecked() const {
+            if (supplier)
+                return supplier();
+            return checked;
+        }
+    };
+
+    class FullCheckBox : public Panel {
+    protected:
+        std::shared_ptr<CheckBox> checkbox;
+    public:
+        FullCheckBox(std::wstring text, glm::vec2 size, bool checked=false);
+
+        virtual void setSupplier(boolsupplier supplier) {
+            checkbox->setSupplier(supplier);
+        }
+
+        virtual void setConsumer(boolconsumer consumer) {
+            checkbox->setConsumer(consumer);
+        }
+
+        virtual void setChecked(bool flag) {
+            checkbox->setChecked(flag);
+        }
+
+        virtual bool isChecked() const {
+            return checkbox->isChecked();
+        }
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_CHECKBOX_HPP_
diff --git a/src/graphics/ui/elements/control/InputBindBox.cpp b/src/graphics/ui/elements/control/InputBindBox.cpp
new file mode 100644
index 00000000..e1f0d7cb
--- /dev/null
+++ b/src/graphics/ui/elements/control/InputBindBox.cpp
@@ -0,0 +1,37 @@
+#include "InputBindBox.hpp"
+
+#include "../display/Label.hpp"
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../../../../util/stringutil.h"
+
+using namespace gui;
+
+InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding) 
+    : Panel(glm::vec2(100,32), padding, 0),
+      binding(binding) {
+    label = std::make_shared<Label>(L"");
+    add(label);
+    setScrollable(false);
+}
+
+void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) {
+    glm::vec2 pos = calcPos();
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+    batch->setColor(isFocused() ? focusedColor : (hover ? hoverColor : color));
+    batch->rect(pos.x, pos.y, size.x, size.y);
+    label->setText(util::str2wstr_utf8(binding.text()));
+}
+
+void InputBindBox::clicked(GUI*, mousecode button) {
+    binding.reset(button);
+    defocus();
+}
+
+void InputBindBox::keyPressed(keycode key) {
+    if (key != keycode::ESCAPE) {
+        binding.reset(key);
+    }
+    defocus();
+}
diff --git a/src/graphics/ui/elements/control/InputBindBox.hpp b/src/graphics/ui/elements/control/InputBindBox.hpp
new file mode 100644
index 00000000..faf3ae7f
--- /dev/null
+++ b/src/graphics/ui/elements/control/InputBindBox.hpp
@@ -0,0 +1,25 @@
+#ifndef GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
+#define GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
+
+#include "../layout/Panel.hpp"
+
+namespace gui {
+    class Label;
+    
+    class InputBindBox : public Panel {
+    protected:
+        glm::vec4 hoverColor {0.05f, 0.1f, 0.2f, 0.75f};
+        glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
+        std::shared_ptr<Label> label;
+        Binding& binding;
+    public:
+        InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f));
+        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+
+        virtual void clicked(GUI*, mousecode button) override;
+        virtual void keyPressed(keycode key) override;
+        virtual bool isFocuskeeper() const override {return true;}
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_INPUTBINDBOX_HPP_
diff --git a/src/graphics/ui/elements/controls.cpp b/src/graphics/ui/elements/control/TextBox.cpp
similarity index 54%
rename from src/graphics/ui/elements/controls.cpp
rename to src/graphics/ui/elements/control/TextBox.cpp
index 61c279e6..d7dbbc91 100644
--- a/src/graphics/ui/elements/controls.cpp
+++ b/src/graphics/ui/elements/control/TextBox.cpp
@@ -1,1018 +1,529 @@
-#include "controls.h"
-
-#include <queue>
-#include <sstream>
-#include <iostream>
-#include <algorithm>
-
-#include "../../../window/Events.h"
-#include "../../../assets/Assets.h"
-#include "../../core/Batch2D.h"
-#include "../../core/Font.h"
-#include "../../core/Texture.h"
-#include "../../core/GfxContext.h"
-#include "../../../util/stringutil.h"
-#include "../GUI.h"
-
-using namespace gui;
-
-Label::Label(std::string text, std::string fontName) 
-  : UINode(glm::vec2(text.length() * 8, 15)), 
-    text(util::str2wstr_utf8(text)), 
-    fontName(fontName) 
-{
-    setInteractive(false);
-}
-
-
-Label::Label(std::wstring text, std::string fontName) 
-  : UINode(glm::vec2(text.length() * 8, 15)), 
-    text(text), 
-    fontName(fontName) 
-{
-    setInteractive(false);
-}
-
-void Label::setText(std::wstring text) {
-    this->text = text;
-    lines = 1;
-    for (size_t i = 0; i < text.length(); i++) {
-        if (text[i] == L'\n') {
-            lines++;
-        }
-    }
-    lines = std::max(lines, 1U);
-}
-
-const std::wstring& Label::getText() const {
-    return text;
-}
-
-void Label::setFontName(std::string name) {
-    this->fontName = name;
-}
-
-const std::string& Label::getFontName() const {
-    return fontName;
-}
-
-void Label::setVerticalAlign(Align align) {
-    this->valign = align;
-}
-
-Align Label::getVerticalAlign() const {
-    return valign;
-}
-
-float Label::getLineInterval() const {
-    return lineInterval;
-}
-
-void Label::setLineInterval(float interval) {
-    lineInterval = interval;
-}
-
-int Label::getTextYOffset() const {
-    return textYOffset;
-}
-
-size_t Label::getTextLineOffset(uint line) const {
-    size_t offset = 0;
-    size_t linesCount = 0;
-    while (linesCount < line && offset < text.length()) {
-        size_t endline = text.find(L'\n', offset);
-        if (endline == std::wstring::npos) {
-            break;
-        }
-        offset = endline+1;
-        linesCount++;
-    }
-    return offset;
-}
-
-int Label::getLineYOffset(uint line) const {
-    return line * totalLineHeight + textYOffset;
-}
-
-uint Label::getLineByYOffset(int offset) const {
-    if (offset < textYOffset) {
-        return 0;
-    }
-    return (offset - textYOffset) / totalLineHeight;
-}
-
-uint Label::getLineByTextIndex(size_t index) const {
-    size_t offset = 0;
-    size_t linesCount = 0;
-    while (offset < index && offset < text.length()) {
-        size_t endline = text.find(L'\n', offset);
-        if (endline == std::wstring::npos) {
-            break;
-        }
-        if (endline+1 > index) {
-            break;
-        }
-        offset = endline+1;
-        linesCount++;
-    }
-    return linesCount;
-}
-
-uint Label::getLinesNumber() const {
-    return lines;
-}
-
-void Label::draw(const GfxContext* pctx, Assets* assets) {
-    if (supplier) {
-        setText(supplier());
-    }
-
-    auto batch = pctx->getBatch2D();
-    auto font = assets->getFont(fontName);
-
-    batch->setColor(getColor());
-
-    uint lineHeight = font->getLineHeight();
-    glm::vec2 size = getSize();
-    glm::vec2 newsize (
-        font->calcWidth(text), 
-        (lines == 1 ? lineHeight : lineHeight*lineInterval)*lines + font->getYOffset()
-    );
-
-    glm::vec2 pos = calcPos();
-    switch (align) {
-        case Align::left:
-            break;
-        case Align::center:
-            pos.x += (size.x-newsize.x)*0.5f;
-            break;
-        case Align::right:
-            pos.x += size.x-newsize.x;
-            break;
-    }
-    switch (valign) {
-        case Align::top:
-            break;
-        case Align::center:
-            pos.y += (size.y-newsize.y)*0.5f;
-            break;
-        case Align::bottom:
-            pos.y += size.y-newsize.y;
-            break;
-    }
-    textYOffset = pos.y-calcPos().y;
-    totalLineHeight = lineHeight * lineInterval;
-
-    if (multiline) {
-        size_t offset = 0;
-        for (uint i = 0; i < lines; i++) {
-            std::wstring_view view(text.c_str()+offset, text.length()-offset);
-            size_t end = view.find(L'\n');
-            if (end != std::wstring::npos) {
-                view = std::wstring_view(text.c_str()+offset, end);
-                offset += end + 1;
-            }
-            font->draw(batch, view, pos.x, pos.y + i * totalLineHeight, FontStyle::none);
-        }
-    } else {
-        font->draw(batch, text, pos.x, pos.y, FontStyle::none);
-    }
-}
-
-void Label::textSupplier(wstringsupplier supplier) {
-    this->supplier = supplier;
-}
-
-
-void Label::setMultiline(bool multiline) {
-    this->multiline = multiline;
-}
-
-bool Label::isMultiline() const {
-    return multiline;
-}
-
-// ================================= Image ====================================
-Image::Image(std::string texture, glm::vec2 size) : UINode(size), texture(texture) {
-    setInteractive(false);
-}
-
-void Image::draw(const GfxContext* pctx, Assets* assets) {
-    glm::vec2 pos = calcPos();
-    glm::vec4 color = getColor();
-    auto batch = pctx->getBatch2D();
-    
-    auto texture = assets->getTexture(this->texture);
-    if (texture && autoresize) {
-        setSize(glm::vec2(texture->getWidth(), texture->getHeight()));
-    }
-    batch->texture(texture);
-    batch->setColor(color);
-    batch->rect(pos.x, pos.y, size.x, size.y, 
-                0, 0, 0, UVRegion(), false, true, color);
-}
-
-void Image::setAutoResize(bool flag) {
-    autoresize = flag;
-}
-bool Image::isAutoResize() const {
-    return autoresize;
-}
-
-// ================================= Button ===================================
-Button::Button(std::shared_ptr<UINode> content, glm::vec4 padding)
-    : Panel(glm::vec2(), padding, 0) {
-    glm::vec4 margin = getMargin();
-    setSize(content->getSize()+
-            glm::vec2(padding[0]+padding[2]+margin[0]+margin[2],
-                      padding[1]+padding[3]+margin[1]+margin[3]));
-    add(content);
-    setScrollable(false);
-    setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
-    setPressedColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.95f));
-    content->setInteractive(false);
-}
-
-Button::Button(
-    std::wstring text, 
-    glm::vec4 padding, 
-    onaction action,
-    glm::vec2 size
-) : Panel(size, padding, 0) 
-{
-    if (size.y < 0.0f) {
-        size = glm::vec2(
-            glm::max(padding.x + padding.z + text.length()*8, size.x),
-            glm::max(padding.y + padding.w + 16, size.y)
-        );
-    }
-    setSize(size);
-
-    if (action) {
-        listenAction(action);
-    }
-    setScrollable(false);
-
-    label = std::make_shared<Label>(text);
-    label->setAlign(Align::center);
-    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
-    label->setInteractive(false);
-    add(label);
-    setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
-    setPressedColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.95f));
-}
-
-void Button::setText(std::wstring text) {
-    if (label) {
-        label->setText(text);
-    }
-}
-
-std::wstring Button::getText() const {
-    if (label) {
-        return label->getText();
-    }
-    return L"";
-}
-
-Button* Button::textSupplier(wstringsupplier supplier) {
-    if (label) {
-        label->textSupplier(supplier);
-    }
-    return this;
-}
-
-void Button::refresh() {
-    Panel::refresh();
-    if (label) {
-        label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
-    }
-}
-
-void Button::drawBackground(const GfxContext* pctx, Assets* assets) {
-    glm::vec2 pos = calcPos();
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-    batch->setColor(isPressed() ? pressedColor : (hover ? hoverColor : color));
-    batch->rect(pos.x, pos.y, size.x, size.y);
-}
-
-void Button::setTextAlign(Align align) {
-    if (label) {
-        label->setAlign(align);
-        refresh();
-    }
-}
-
-Align Button::getTextAlign() const {
-    if (label) {
-        return label->getAlign();
-    }
-    return Align::left;
-}
-
-// ================================ TextBox ===================================
-TextBox::TextBox(std::wstring placeholder, glm::vec4 padding) 
-    : Panel(glm::vec2(200,32), padding, 0), 
-      input(L""),
-      placeholder(placeholder) {
-    label = std::make_shared<Label>(L"");
-    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
-    add(label);
-    setHoverColor(glm::vec4(0.05f, 0.1f, 0.2f, 0.75f));
-
-    textInitX = label->getPos().x;
-}
-
-void TextBox::draw(const GfxContext* pctx, Assets* assets) {
-    Panel::draw(pctx, assets);
-
-    font = assets->getFont(label->getFontName());
-
-    if (!isFocused())
-        return;
-
-    glm::vec2 pos = calcPos();
-    glm::vec2 size = getSize();
-
-    auto subctx = pctx->sub();
-    subctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
-
-    const int lineHeight = font->getLineHeight() * label->getLineInterval();
-    glm::vec2 lcoord = label->calcPos();
-    lcoord.y -= 2;
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-    if (editable && int((Window::time() - caretLastMove) * 2) % 2 == 0) {
-        uint line = label->getLineByTextIndex(caret);
-        uint lcaret = caret - label->getTextLineOffset(line);
-        batch->setColor(glm::vec4(1.0f));
-
-        int width = font->calcWidth(input, lcaret);
-        batch->rect(lcoord.x + width, lcoord.y+label->getLineYOffset(line), 2, lineHeight);
-    }
-    if (selectionStart != selectionEnd) {
-        uint startLine = label->getLineByTextIndex(selectionStart);
-        uint endLine = label->getLineByTextIndex(selectionEnd);
-
-        batch->setColor(glm::vec4(0.8f, 0.9f, 1.0f, 0.25f));
-        int start = font->calcWidth(input, selectionStart-label->getTextLineOffset(startLine));
-        int end = font->calcWidth(input, selectionEnd-label->getTextLineOffset(endLine));
-        int startY = label->getLineYOffset(startLine);
-        int endY = label->getLineYOffset(startLine);
-
-        if (startLine == endLine) {
-            batch->rect(lcoord.x + start, lcoord.y+startY, end-start, lineHeight);
-        } else {
-            batch->rect(lcoord.x + start, lcoord.y+endY, label->getSize().x-start-padding.z-padding.x-2, lineHeight);
-            for (uint i = startLine+1; i < endLine; i++) {
-                batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(i), label->getSize().x-padding.z-padding.x-2, lineHeight);
-            }
-            batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(endLine), end, lineHeight);
-        }
-    }
-}
-
-void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) {
-    glm::vec2 pos = calcPos();
-
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-
-    auto subctx = pctx->sub();
-    subctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
-
-    if (valid) {
-        if (isFocused() && !multiline) {
-            batch->setColor(focusedColor);
-        } else if (hover && !multiline) {
-            batch->setColor(hoverColor);
-        } else {
-            batch->setColor(color);
-        }
-    } else {
-        batch->setColor(invalidColor);
-    }
-
-    batch->rect(pos.x, pos.y, size.x, size.y);
-    if (!isFocused() && supplier) {
-        input = supplier();
-    }
-
-    if (isFocused() && multiline) {
-        batch->setColor(glm::vec4(1, 1, 1, 0.1f));
-        glm::vec2 lcoord = label->calcPos();
-        lcoord.y -= 2;
-        uint line = label->getLineByTextIndex(caret);
-        int lineY = label->getLineYOffset(line);
-        int lineHeight = font->getLineHeight() * label->getLineInterval();
-        batch->rect(lcoord.x, lcoord.y+lineY, label->getSize().x, 1);
-        batch->rect(lcoord.x, lcoord.y+lineY+lineHeight-2, label->getSize().x, 1);
-    }
-
-    label->setColor(glm::vec4(input.empty() ? 0.5f : 1.0f));
-    label->setText(getText());
-    if (multiline && font) {
-        setScrollable(true);
-        uint height = label->getLinesNumber() * font->getLineHeight() * label->getLineInterval();
-        label->setSize(glm::vec2(label->getSize().x, height));
-        actualLength = height;
-    } else {
-        setScrollable(false);
-    }
-}
-
-/// @brief Insert text at the caret. Also selected text will be erased
-/// @param text Inserting text
-void TextBox::paste(const std::wstring& text) {
-    
-    eraseSelected();
-    if (caret >= input.length()) {
-        input += text;
-    } else {
-        auto left = input.substr(0, caret);
-        auto right = input.substr(caret);
-        input = left + text + right;
-    }
-    input.erase(std::remove(input.begin(), input.end(), '\r'), input.end());
-    // refresh label lines configuration for correct setCaret work
-    label->setText(input);
-    
-    setCaret(caret + text.length());
-    validate();
-}
-
-/// @brief Remove part of the text and move caret to start of the part
-/// @param start start of the part
-/// @param length length of part that will be removed
-void TextBox::erase(size_t start, size_t length) {
-    size_t end = start + length;
-    if (caret > start) {
-        setCaret(caret - length);
-    }
-    auto left = input.substr(0, start);
-    auto right = input.substr(end);
-    input = left + right;
-}
-
-/// @brief Remove all selected text and reset selection
-/// @return true if erased anything
-bool TextBox::eraseSelected() {
-    if (selectionStart == selectionEnd) {
-        return false;
-    }
-    erase(selectionStart, selectionEnd-selectionStart);
-    resetSelection();
-    return true;
-}
-
-void TextBox::resetSelection() {
-    selectionOrigin = 0;
-    selectionStart = 0;
-    selectionEnd = 0;
-}
-
-void TextBox::extendSelection(int index) {
-    size_t normalized = normalizeIndex(index);
-    selectionStart = std::min(selectionOrigin, normalized);
-    selectionEnd = std::max(selectionOrigin, normalized);
-}
-
-size_t TextBox::getLineLength(uint line) const {
-    size_t position = label->getTextLineOffset(line);
-    size_t lineLength = label->getTextLineOffset(line+1)-position;
-    if (lineLength == 0)
-        lineLength = input.length() - position + 1;
-    return lineLength;
-}
-
-size_t TextBox::getSelectionLength() const {
-    return selectionEnd - selectionStart;
-}
-
-/// @brief Set scroll offset
-/// @param x scroll offset
-void TextBox::setTextOffset(uint x) {
-    label->setPos(glm::vec2(textInitX - int(x), label->getPos().y));
-    textOffset = x;
-}
-
-void TextBox::typed(unsigned int codepoint) {
-    paste(std::wstring({(wchar_t)codepoint}));
-}
-
-bool TextBox::validate() {
-    if (validator) {
-        valid = validator(getText());
-    } else {
-        valid = true;
-    }
-    return valid;
-}
-
-void TextBox::setValid(bool valid) {
-    this->valid = valid;
-}
-
-bool TextBox::isValid() const {
-    return valid;
-}
-
-void TextBox::setMultiline(bool multiline) {
-    this->multiline = multiline;
-    label->setMultiline(multiline);
-    label->setVerticalAlign(multiline ? Align::top : Align::center);
-}
-
-bool TextBox::isMultiline() const {
-    return multiline;
-}
-
-void TextBox::setEditable(bool editable) {
-    this->editable = editable;
-}
-
-bool TextBox::isEditable() const {
-    return editable;
-}
-
-void TextBox::setOnEditStart(runnable oneditstart) {
-    onEditStart = oneditstart;
-}
-
-void TextBox::onFocus(GUI* gui) {
-    Panel::onFocus(gui);
-    if (onEditStart){
-        setCaret(input.size());
-        onEditStart();
-        resetSelection();
-    }
-}
-
-void TextBox::refresh() {
-    Panel::refresh();
-    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
-}
-
-/// @brief Clamp index to range [0, input.length()]
-/// @param index non-normalized index
-/// @return normalized index
-size_t TextBox::normalizeIndex(int index) {
-    return std::min(input.length(), static_cast<size_t>(std::max(0, index)));
-}
-
-/// @brief Calculate index of character at defined screen X position
-/// @param x screen X position
-/// @param y screen Y position
-/// @return non-normalized character index
-int TextBox::calcIndexAt(int x, int y) const {
-    if (font == nullptr)
-        return 0;
-    glm::vec2 lcoord = label->calcPos();
-    uint line = label->getLineByYOffset(y-lcoord.y);
-    line = std::min(line, label->getLinesNumber()-1);
-    size_t lineLength = getLineLength(line);
-    uint offset = 0;
-    while (lcoord.x + font->calcWidth(input, offset) < x && offset < lineLength-1) {
-        offset++;
-    }
-    return std::min(offset+label->getTextLineOffset(line), input.length());
-}
-
-void TextBox::click(GUI*, int x, int y) {
-    int index = normalizeIndex(calcIndexAt(x, y));
-    selectionStart = index;
-    selectionEnd = index;
-    selectionOrigin = index;
-}
-
-void TextBox::mouseMove(GUI*, int x, int y) {
-    int index = calcIndexAt(x, y);
-    setCaret(index);
-    extendSelection(index);
-    resetMaxLocalCaret();
-}
-
-void TextBox::resetMaxLocalCaret() {
-    maxLocalCaret = caret - label->getTextLineOffset(label->getLineByTextIndex(caret));
-}
-
-void TextBox::performEditingKeyboardEvents(keycode key) {
-    bool shiftPressed = Events::pressed(keycode::LEFT_SHIFT);
-    bool breakSelection = getSelectionLength() != 0 && !shiftPressed;
-    uint previousCaret = caret;
-    if (key == keycode::BACKSPACE) {
-        if (!eraseSelected() && caret > 0 && input.length() > 0) {
-            if (caret > input.length()) {
-                caret = input.length();
-            }
-            input = input.substr(0, caret-1) + input.substr(caret);
-            setCaret(caret-1);
-            validate();
-        }
-    } else if (key == keycode::DELETE) {
-        if (!eraseSelected() && caret < input.length()) {
-            input = input.substr(0, caret) + input.substr(caret + 1);
-            validate();
-        }
-    } else if (key == keycode::ENTER) {
-        if (multiline) {
-            paste(L"\n");
-        } else {
-            if (validate() && consumer) {
-                consumer(label->getText());
-            }
-            defocus();
-        }
-    } else if (key == keycode::TAB) {
-        paste(L"    ");
-    } else if (key == keycode::LEFT) {
-        uint caret = breakSelection ? selectionStart : this->caret;
-        if (caret > 0) {
-            if (caret > input.length()) {
-                setCaret(input.length()-1);
-            } else {
-                setCaret(caret-1);
-            }
-            if (shiftPressed) {
-                if (selectionStart == selectionEnd) {
-                    selectionOrigin = previousCaret;
-                }
-                extendSelection(this->caret);
-            } else {
-                resetSelection();
-            }
-        } else {
-            setCaret(caret);
-            resetSelection();
-        }
-        resetMaxLocalCaret();
-    } else if (key == keycode::RIGHT) {
-        uint caret = breakSelection ? selectionEnd : this->caret;
-        if (caret < input.length()) {
-            setCaret(caret+1);
-            caretLastMove = Window::time();
-            if (shiftPressed) {
-                if (selectionStart == selectionEnd) {
-                    selectionOrigin = previousCaret;
-                }
-                extendSelection(this->caret);
-            } else {
-                resetSelection();
-            }
-        } else {
-            setCaret(caret);
-            resetSelection();
-        }
-        resetMaxLocalCaret();
-    } else if (key == keycode::UP) {
-        uint caret = breakSelection ? selectionStart : this->caret;
-        uint caretLine = label->getLineByTextIndex(caret);
-        if (caretLine > 0) {
-            uint offset = std::min(size_t(maxLocalCaret), getLineLength(caretLine-1)-1);
-            setCaret(label->getTextLineOffset(caretLine-1) + offset);
-        } else {
-            setCaret(0);
-        }
-        if (shiftPressed) {
-            if (selectionStart == selectionEnd) {
-                selectionOrigin = previousCaret;
-            }
-            extendSelection(this->caret);
-        } else {
-            resetSelection();
-        }
-    } else if (key == keycode::DOWN) {
-        uint caret = breakSelection ? selectionEnd : this->caret;
-        uint caretLine = label->getLineByTextIndex(caret);
-        if (caretLine < label->getLinesNumber()-1) {
-            uint offset = std::min(size_t(maxLocalCaret), getLineLength(caretLine+1)-1);
-            setCaret(label->getTextLineOffset(caretLine+1) + offset);
-        } else {
-            setCaret(input.length());
-        }
-        if (shiftPressed) {
-            if (selectionStart == selectionEnd) {
-                selectionOrigin = previousCaret;
-            }
-            extendSelection(this->caret);
-        } else {
-            resetSelection();
-        }
-    }
-}
-
-void TextBox::keyPressed(keycode key) {
-    if (editable) {
-        performEditingKeyboardEvents(key);
-    }
-    if (Events::pressed(keycode::LEFT_CONTROL)) {
-        // Copy selected text to clipboard
-        if (key == keycode::C || key == keycode::X) {
-            std::string text = util::wstr2str_utf8(getSelection());
-            if (!text.empty()) {
-                Window::setClipboardText(text.c_str());
-            }
-            if (editable && key == keycode::X) {
-                eraseSelected();
-            }
-        }
-        // Paste text from clipboard
-        if (key == keycode::V && editable) {
-            const char* text = Window::getClipboardText();
-            if (text) {
-                paste(util::str2wstr_utf8(text));
-            }
-        }
-        // Select/deselect all
-        if (key == keycode::A) {
-            if (selectionStart == selectionEnd) {
-                select(0, input.length());
-            } else {
-                resetSelection();
-            }
-        }
-    }
-}
-
-void TextBox::select(int start, int end) {
-    if (end < start) {
-        std::swap(start, end);
-    }
-    start = normalizeIndex(start);
-    end = normalizeIndex(end);
-
-    selectionStart = start;
-    selectionEnd = end;
-    selectionOrigin = start;
-    setCaret(selectionEnd);
-}
-
-std::shared_ptr<UINode> TextBox::getAt(glm::vec2 pos, std::shared_ptr<UINode> self) {
-    return UINode::getAt(pos, self);
-}
-
-void TextBox::setTextSupplier(wstringsupplier supplier) {
-    this->supplier = supplier;
-}
-
-void TextBox::setTextConsumer(wstringconsumer consumer) {
-    this->consumer = consumer;
-}
-
-void TextBox::setTextValidator(wstringchecker validator) {
-    this->validator = validator;
-}
-
-void TextBox::setFocusedColor(glm::vec4 color) {
-    this->focusedColor = color;
-}
-
-glm::vec4 TextBox::getFocusedColor() const {
-    return focusedColor;
-}
-
-void TextBox::setErrorColor(glm::vec4 color) {
-    this->invalidColor = color;
-}
-
-glm::vec4 TextBox::getErrorColor() const {
-    return invalidColor;
-}
-
-std::wstring TextBox::getText() const {
-    if (input.empty())
-        return placeholder;
-    return input;
-}
-
-void TextBox::setText(const std::wstring value) {
-    this->input = value;
-    input.erase(std::remove(input.begin(), input.end(), '\r'), input.end());
-}
-
-std::wstring TextBox::getPlaceholder() const {
-    return placeholder;
-}
-
-void TextBox::setPlaceholder(const std::wstring& placeholder) {
-    this->placeholder = placeholder;
-}
-
-std::wstring TextBox::getSelection() const {
-    return input.substr(selectionStart, selectionEnd-selectionStart);
-}
-
-uint TextBox::getCaret() const {
-    return caret;
-}
-
-void TextBox::setCaret(uint position) {
-    this->caret = std::min(size_t(position), input.length());
-    caretLastMove = Window::time();
-
-    int width = label->getSize().x;
-    uint line = label->getLineByTextIndex(caret);
-    int offset = label->getLineYOffset(line) + contentOffset().y;
-    uint lineHeight = font->getLineHeight()*label->getLineInterval();
-    scrollStep = lineHeight;
-    if (offset < 0) {
-        scrolled(1);
-    } else if (offset >= getSize().y) {
-        scrolled(-1);
-    }
-    uint lcaret = caret - label->getTextLineOffset(line);
-    int realoffset = font->calcWidth(input, lcaret)-int(textOffset)+2;
-    if (realoffset-width > 0) {
-        setTextOffset(textOffset + realoffset-width);
-    } else if (realoffset < 0) {
-        setTextOffset(std::max(textOffset + realoffset, 0U));
-    }
-}
-
-// ============================== InputBindBox ================================
-InputBindBox::InputBindBox(Binding& binding, glm::vec4 padding) 
-    : Panel(glm::vec2(100,32), padding, 0),
-      binding(binding) {
-    label = std::make_shared<Label>(L"");
-    add(label);
-    setScrollable(false);
-}
-
-void InputBindBox::drawBackground(const GfxContext* pctx, Assets* assets) {
-    glm::vec2 pos = calcPos();
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-    batch->setColor(isFocused() ? focusedColor : (hover ? hoverColor : color));
-    batch->rect(pos.x, pos.y, size.x, size.y);
-    label->setText(util::str2wstr_utf8(binding.text()));
-}
-
-void InputBindBox::clicked(GUI*, mousecode button) {
-    binding.reset(button);
-    defocus();
-}
-
-void InputBindBox::keyPressed(keycode key) {
-    if (key != keycode::ESCAPE) {
-        binding.reset(key);
-    }
-    defocus();
-}
-
-// ================================ TrackBar ==================================
-TrackBar::TrackBar(
-    double min, 
-    double max, 
-    double value, 
-    double step, 
-    int trackWidth
-) : UINode(glm::vec2(26)), 
-    min(min), 
-    max(max), 
-    value(value), 
-    step(step), 
-    trackWidth(trackWidth) 
-{
-    setColor(glm::vec4(0.f, 0.f, 0.f, 0.4f));
-    setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f));
-}
-
-void TrackBar::draw(const GfxContext* pctx, Assets* assets) {
-    if (supplier) {
-        value = supplier();
-    }
-    glm::vec2 pos = calcPos();
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-    batch->setColor(hover ? hoverColor : color);
-    batch->rect(pos.x, pos.y, size.x, size.y);
-
-    float width = size.x;
-    float t = (value - min) / (max-min+trackWidth*step);
-
-    batch->setColor(trackColor);
-    int actualWidth = size.x * (trackWidth / (max-min+trackWidth*step) * step);
-    batch->rect(pos.x + width * t, pos.y, actualWidth, size.y);
-}
-
-void TrackBar::setSupplier(doublesupplier supplier) {
-    this->supplier = supplier;
-}
-
-void TrackBar::setConsumer(doubleconsumer consumer) {
-    this->consumer = consumer;
-}
-
-void TrackBar::mouseMove(GUI*, int x, int y) {
-    glm::vec2 pos = calcPos();
-    value = x;
-    value -= pos.x;
-    value = (value)/size.x * (max-min+trackWidth*step);
-    value += min;
-    value = (value > max) ? max : value;
-    value = (value < min) ? min : value;
-    value = (int64_t)round(value / step) * step;
-
-    if (consumer) {
-        consumer(value);
-    }
-}
-
-
-double TrackBar::getValue() const {
-    return value;
-}
-
-double TrackBar::getMin() const {
-    return min;
-}
-
-double TrackBar::getMax() const {
-    return max;
-}
-
-double TrackBar::getStep() const {
-    return step;
-}
-
-int TrackBar::getTrackWidth() const {
-    return trackWidth;
-}
-
-glm::vec4 TrackBar::getTrackColor() const {
-    return trackColor;
-}
-
-void TrackBar::setValue(double x) {
-    value = x;
-}
-
-void TrackBar::setMin(double x) {
-    min = x;
-}
-
-void TrackBar::setMax(double x) {
-    max = x;
-}
-
-void TrackBar::setStep(double x) {
-    step = x;
-}
-
-void TrackBar::setTrackWidth(int width) {
-    trackWidth = width;
-}
-
-void TrackBar::setTrackColor(glm::vec4 color) {
-    trackColor = color;
-}
-
-// ================================ CheckBox ==================================
-CheckBox::CheckBox(bool checked) : UINode(glm::vec2(32.0f)), checked(checked) {
-    setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
-}
-
-void CheckBox::draw(const GfxContext* pctx, Assets* assets) {
-    if (supplier) {
-        checked = supplier();
-    }
-    glm::vec2 pos = calcPos();
-    auto batch = pctx->getBatch2D();
-    batch->texture(nullptr);
-    batch->setColor(checked ? checkColor : (hover ? hoverColor : color));
-    batch->rect(pos.x, pos.y, size.x, size.y);
-}
-
-void CheckBox::mouseRelease(GUI*, int x, int y) {
-    checked = !checked;
-    if (consumer) {
-        consumer(checked);
-    }
-}
-
-void CheckBox::setSupplier(boolsupplier supplier) {
-    this->supplier = supplier;
-}
-
-void CheckBox::setConsumer(boolconsumer consumer) {
-    this->consumer = consumer;
-}
-
-CheckBox* CheckBox::setChecked(bool flag) {
-    checked = flag;
-    return this;
-}
-
-FullCheckBox::FullCheckBox(std::wstring text, glm::vec2 size, bool checked)
-    : Panel(size), 
-      checkbox(std::make_shared<CheckBox>(checked)){
-    setColor(glm::vec4(0.0f));
-    setOrientation(Orientation::horizontal);
-
-    add(checkbox);
-
-    auto label = std::make_shared<Label>(text); 
-    label->setMargin(glm::vec4(5.f, 5.f, 0.f, 0.f));
-    add(label);
-}
+#include "TextBox.hpp"
+
+#include "../display/Label.hpp"
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../../../core/Font.h"
+#include "../../../../assets/Assets.h"
+#include "../../../../util/stringutil.h"
+#include "../../../../window/Events.h"
+
+using namespace gui;
+
+TextBox::TextBox(std::wstring placeholder, glm::vec4 padding) 
+    : Panel(glm::vec2(200,32), padding, 0), 
+      input(L""),
+      placeholder(placeholder) {
+    label = std::make_shared<Label>(L"");
+    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+    add(label);
+    setHoverColor(glm::vec4(0.05f, 0.1f, 0.2f, 0.75f));
+
+    textInitX = label->getPos().x;
+}
+
+void TextBox::draw(const GfxContext* pctx, Assets* assets) {
+    Panel::draw(pctx, assets);
+
+    font = assets->getFont(label->getFontName());
+
+    if (!isFocused())
+        return;
+
+    glm::vec2 pos = calcPos();
+    glm::vec2 size = getSize();
+
+    auto subctx = pctx->sub();
+    subctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
+
+    const int lineHeight = font->getLineHeight() * label->getLineInterval();
+    glm::vec2 lcoord = label->calcPos();
+    lcoord.y -= 2;
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+    if (editable && int((Window::time() - caretLastMove) * 2) % 2 == 0) {
+        uint line = label->getLineByTextIndex(caret);
+        uint lcaret = caret - label->getTextLineOffset(line);
+        batch->setColor(glm::vec4(1.0f));
+
+        int width = font->calcWidth(input, lcaret);
+        batch->rect(lcoord.x + width, lcoord.y+label->getLineYOffset(line), 2, lineHeight);
+    }
+    if (selectionStart != selectionEnd) {
+        uint startLine = label->getLineByTextIndex(selectionStart);
+        uint endLine = label->getLineByTextIndex(selectionEnd);
+
+        batch->setColor(glm::vec4(0.8f, 0.9f, 1.0f, 0.25f));
+        int start = font->calcWidth(input, selectionStart-label->getTextLineOffset(startLine));
+        int end = font->calcWidth(input, selectionEnd-label->getTextLineOffset(endLine));
+        int startY = label->getLineYOffset(startLine);
+        int endY = label->getLineYOffset(startLine);
+
+        if (startLine == endLine) {
+            batch->rect(lcoord.x + start, lcoord.y+startY, end-start, lineHeight);
+        } else {
+            batch->rect(lcoord.x + start, lcoord.y+endY, label->getSize().x-start-padding.z-padding.x-2, lineHeight);
+            for (uint i = startLine+1; i < endLine; i++) {
+                batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(i), label->getSize().x-padding.z-padding.x-2, lineHeight);
+            }
+            batch->rect(lcoord.x, lcoord.y+label->getLineYOffset(endLine), end, lineHeight);
+        }
+    }
+}
+
+void TextBox::drawBackground(const GfxContext* pctx, Assets* assets) {
+    glm::vec2 pos = calcPos();
+
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+
+    auto subctx = pctx->sub();
+    subctx.setScissors(glm::vec4(pos.x, pos.y, size.x, size.y));
+
+    if (valid) {
+        if (isFocused() && !multiline) {
+            batch->setColor(focusedColor);
+        } else if (hover && !multiline) {
+            batch->setColor(hoverColor);
+        } else {
+            batch->setColor(color);
+        }
+    } else {
+        batch->setColor(invalidColor);
+    }
+
+    batch->rect(pos.x, pos.y, size.x, size.y);
+    if (!isFocused() && supplier) {
+        input = supplier();
+    }
+
+    if (isFocused() && multiline) {
+        batch->setColor(glm::vec4(1, 1, 1, 0.1f));
+        glm::vec2 lcoord = label->calcPos();
+        lcoord.y -= 2;
+        uint line = label->getLineByTextIndex(caret);
+        int lineY = label->getLineYOffset(line);
+        int lineHeight = font->getLineHeight() * label->getLineInterval();
+        batch->rect(lcoord.x, lcoord.y+lineY, label->getSize().x, 1);
+        batch->rect(lcoord.x, lcoord.y+lineY+lineHeight-2, label->getSize().x, 1);
+    }
+
+    label->setColor(glm::vec4(input.empty() ? 0.5f : 1.0f));
+    label->setText(getText());
+    if (multiline && font) {
+        setScrollable(true);
+        uint height = label->getLinesNumber() * font->getLineHeight() * label->getLineInterval();
+        label->setSize(glm::vec2(label->getSize().x, height));
+        actualLength = height;
+    } else {
+        setScrollable(false);
+    }
+}
+
+/// @brief Insert text at the caret. Also selected text will be erased
+/// @param text Inserting text
+void TextBox::paste(const std::wstring& text) {
+    
+    eraseSelected();
+    if (caret >= input.length()) {
+        input += text;
+    } else {
+        auto left = input.substr(0, caret);
+        auto right = input.substr(caret);
+        input = left + text + right;
+    }
+    input.erase(std::remove(input.begin(), input.end(), '\r'), input.end());
+    // refresh label lines configuration for correct setCaret work
+    label->setText(input);
+    
+    setCaret(caret + text.length());
+    validate();
+}
+
+/// @brief Remove part of the text and move caret to start of the part
+/// @param start start of the part
+/// @param length length of part that will be removed
+void TextBox::erase(size_t start, size_t length) {
+    size_t end = start + length;
+    if (caret > start) {
+        setCaret(caret - length);
+    }
+    auto left = input.substr(0, start);
+    auto right = input.substr(end);
+    input = left + right;
+}
+
+/// @brief Remove all selected text and reset selection
+/// @return true if erased anything
+bool TextBox::eraseSelected() {
+    if (selectionStart == selectionEnd) {
+        return false;
+    }
+    erase(selectionStart, selectionEnd-selectionStart);
+    resetSelection();
+    return true;
+}
+
+void TextBox::resetSelection() {
+    selectionOrigin = 0;
+    selectionStart = 0;
+    selectionEnd = 0;
+}
+
+void TextBox::extendSelection(int index) {
+    size_t normalized = normalizeIndex(index);
+    selectionStart = std::min(selectionOrigin, normalized);
+    selectionEnd = std::max(selectionOrigin, normalized);
+}
+
+size_t TextBox::getLineLength(uint line) const {
+    size_t position = label->getTextLineOffset(line);
+    size_t lineLength = label->getTextLineOffset(line+1)-position;
+    if (lineLength == 0)
+        lineLength = input.length() - position + 1;
+    return lineLength;
+}
+
+size_t TextBox::getSelectionLength() const {
+    return selectionEnd - selectionStart;
+}
+
+/// @brief Set scroll offset
+/// @param x scroll offset
+void TextBox::setTextOffset(uint x) {
+    label->setPos(glm::vec2(textInitX - int(x), label->getPos().y));
+    textOffset = x;
+}
+
+void TextBox::typed(unsigned int codepoint) {
+    paste(std::wstring({(wchar_t)codepoint}));
+}
+
+bool TextBox::validate() {
+    if (validator) {
+        valid = validator(getText());
+    } else {
+        valid = true;
+    }
+    return valid;
+}
+
+void TextBox::setValid(bool valid) {
+    this->valid = valid;
+}
+
+bool TextBox::isValid() const {
+    return valid;
+}
+
+void TextBox::setMultiline(bool multiline) {
+    this->multiline = multiline;
+    label->setMultiline(multiline);
+    label->setVerticalAlign(multiline ? Align::top : Align::center);
+}
+
+bool TextBox::isMultiline() const {
+    return multiline;
+}
+
+void TextBox::setEditable(bool editable) {
+    this->editable = editable;
+}
+
+bool TextBox::isEditable() const {
+    return editable;
+}
+
+void TextBox::setOnEditStart(runnable oneditstart) {
+    onEditStart = oneditstart;
+}
+
+void TextBox::onFocus(GUI* gui) {
+    Panel::onFocus(gui);
+    if (onEditStart){
+        setCaret(input.size());
+        onEditStart();
+        resetSelection();
+    }
+}
+
+void TextBox::refresh() {
+    Panel::refresh();
+    label->setSize(size-glm::vec2(padding.z+padding.x, padding.w+padding.y));
+}
+
+/// @brief Clamp index to range [0, input.length()]
+/// @param index non-normalized index
+/// @return normalized index
+size_t TextBox::normalizeIndex(int index) {
+    return std::min(input.length(), static_cast<size_t>(std::max(0, index)));
+}
+
+/// @brief Calculate index of character at defined screen X position
+/// @param x screen X position
+/// @param y screen Y position
+/// @return non-normalized character index
+int TextBox::calcIndexAt(int x, int y) const {
+    if (font == nullptr)
+        return 0;
+    glm::vec2 lcoord = label->calcPos();
+    uint line = label->getLineByYOffset(y-lcoord.y);
+    line = std::min(line, label->getLinesNumber()-1);
+    size_t lineLength = getLineLength(line);
+    uint offset = 0;
+    while (lcoord.x + font->calcWidth(input, offset) < x && offset < lineLength-1) {
+        offset++;
+    }
+    return std::min(offset+label->getTextLineOffset(line), input.length());
+}
+
+void TextBox::click(GUI*, int x, int y) {
+    int index = normalizeIndex(calcIndexAt(x, y));
+    selectionStart = index;
+    selectionEnd = index;
+    selectionOrigin = index;
+}
+
+void TextBox::mouseMove(GUI*, int x, int y) {
+    int index = calcIndexAt(x, y);
+    setCaret(index);
+    extendSelection(index);
+    resetMaxLocalCaret();
+}
+
+void TextBox::resetMaxLocalCaret() {
+    maxLocalCaret = caret - label->getTextLineOffset(label->getLineByTextIndex(caret));
+}
+
+void TextBox::performEditingKeyboardEvents(keycode key) {
+    bool shiftPressed = Events::pressed(keycode::LEFT_SHIFT);
+    bool breakSelection = getSelectionLength() != 0 && !shiftPressed;
+    uint previousCaret = caret;
+    if (key == keycode::BACKSPACE) {
+        if (!eraseSelected() && caret > 0 && input.length() > 0) {
+            if (caret > input.length()) {
+                caret = input.length();
+            }
+            input = input.substr(0, caret-1) + input.substr(caret);
+            setCaret(caret-1);
+            validate();
+        }
+    } else if (key == keycode::DELETE) {
+        if (!eraseSelected() && caret < input.length()) {
+            input = input.substr(0, caret) + input.substr(caret + 1);
+            validate();
+        }
+    } else if (key == keycode::ENTER) {
+        if (multiline) {
+            paste(L"\n");
+        } else {
+            if (validate() && consumer) {
+                consumer(label->getText());
+            }
+            defocus();
+        }
+    } else if (key == keycode::TAB) {
+        paste(L"    ");
+    } else if (key == keycode::LEFT) {
+        uint caret = breakSelection ? selectionStart : this->caret;
+        if (caret > 0) {
+            if (caret > input.length()) {
+                setCaret(input.length()-1);
+            } else {
+                setCaret(caret-1);
+            }
+            if (shiftPressed) {
+                if (selectionStart == selectionEnd) {
+                    selectionOrigin = previousCaret;
+                }
+                extendSelection(this->caret);
+            } else {
+                resetSelection();
+            }
+        } else {
+            setCaret(caret);
+            resetSelection();
+        }
+        resetMaxLocalCaret();
+    } else if (key == keycode::RIGHT) {
+        uint caret = breakSelection ? selectionEnd : this->caret;
+        if (caret < input.length()) {
+            setCaret(caret+1);
+            caretLastMove = Window::time();
+            if (shiftPressed) {
+                if (selectionStart == selectionEnd) {
+                    selectionOrigin = previousCaret;
+                }
+                extendSelection(this->caret);
+            } else {
+                resetSelection();
+            }
+        } else {
+            setCaret(caret);
+            resetSelection();
+        }
+        resetMaxLocalCaret();
+    } else if (key == keycode::UP) {
+        uint caret = breakSelection ? selectionStart : this->caret;
+        uint caretLine = label->getLineByTextIndex(caret);
+        if (caretLine > 0) {
+            uint offset = std::min(size_t(maxLocalCaret), getLineLength(caretLine-1)-1);
+            setCaret(label->getTextLineOffset(caretLine-1) + offset);
+        } else {
+            setCaret(0);
+        }
+        if (shiftPressed) {
+            if (selectionStart == selectionEnd) {
+                selectionOrigin = previousCaret;
+            }
+            extendSelection(this->caret);
+        } else {
+            resetSelection();
+        }
+    } else if (key == keycode::DOWN) {
+        uint caret = breakSelection ? selectionEnd : this->caret;
+        uint caretLine = label->getLineByTextIndex(caret);
+        if (caretLine < label->getLinesNumber()-1) {
+            uint offset = std::min(size_t(maxLocalCaret), getLineLength(caretLine+1)-1);
+            setCaret(label->getTextLineOffset(caretLine+1) + offset);
+        } else {
+            setCaret(input.length());
+        }
+        if (shiftPressed) {
+            if (selectionStart == selectionEnd) {
+                selectionOrigin = previousCaret;
+            }
+            extendSelection(this->caret);
+        } else {
+            resetSelection();
+        }
+    }
+}
+
+void TextBox::keyPressed(keycode key) {
+    if (editable) {
+        performEditingKeyboardEvents(key);
+    }
+    if (Events::pressed(keycode::LEFT_CONTROL)) {
+        // Copy selected text to clipboard
+        if (key == keycode::C || key == keycode::X) {
+            std::string text = util::wstr2str_utf8(getSelection());
+            if (!text.empty()) {
+                Window::setClipboardText(text.c_str());
+            }
+            if (editable && key == keycode::X) {
+                eraseSelected();
+            }
+        }
+        // Paste text from clipboard
+        if (key == keycode::V && editable) {
+            const char* text = Window::getClipboardText();
+            if (text) {
+                paste(util::str2wstr_utf8(text));
+            }
+        }
+        // Select/deselect all
+        if (key == keycode::A) {
+            if (selectionStart == selectionEnd) {
+                select(0, input.length());
+            } else {
+                resetSelection();
+            }
+        }
+    }
+}
+
+void TextBox::select(int start, int end) {
+    if (end < start) {
+        std::swap(start, end);
+    }
+    start = normalizeIndex(start);
+    end = normalizeIndex(end);
+
+    selectionStart = start;
+    selectionEnd = end;
+    selectionOrigin = start;
+    setCaret(selectionEnd);
+}
+
+std::shared_ptr<UINode> TextBox::getAt(glm::vec2 pos, std::shared_ptr<UINode> self) {
+    return UINode::getAt(pos, self);
+}
+
+void TextBox::setTextSupplier(wstringsupplier supplier) {
+    this->supplier = supplier;
+}
+
+void TextBox::setTextConsumer(wstringconsumer consumer) {
+    this->consumer = consumer;
+}
+
+void TextBox::setTextValidator(wstringchecker validator) {
+    this->validator = validator;
+}
+
+void TextBox::setFocusedColor(glm::vec4 color) {
+    this->focusedColor = color;
+}
+
+glm::vec4 TextBox::getFocusedColor() const {
+    return focusedColor;
+}
+
+void TextBox::setErrorColor(glm::vec4 color) {
+    this->invalidColor = color;
+}
+
+glm::vec4 TextBox::getErrorColor() const {
+    return invalidColor;
+}
+
+std::wstring TextBox::getText() const {
+    if (input.empty())
+        return placeholder;
+    return input;
+}
+
+void TextBox::setText(const std::wstring value) {
+    this->input = value;
+    input.erase(std::remove(input.begin(), input.end(), '\r'), input.end());
+}
+
+std::wstring TextBox::getPlaceholder() const {
+    return placeholder;
+}
+
+void TextBox::setPlaceholder(const std::wstring& placeholder) {
+    this->placeholder = placeholder;
+}
+
+std::wstring TextBox::getSelection() const {
+    return input.substr(selectionStart, selectionEnd-selectionStart);
+}
+
+uint TextBox::getCaret() const {
+    return caret;
+}
+
+void TextBox::setCaret(uint position) {
+    this->caret = std::min(size_t(position), input.length());
+    caretLastMove = Window::time();
+
+    int width = label->getSize().x;
+    uint line = label->getLineByTextIndex(caret);
+    int offset = label->getLineYOffset(line) + contentOffset().y;
+    uint lineHeight = font->getLineHeight()*label->getLineInterval();
+    scrollStep = lineHeight;
+    if (offset < 0) {
+        scrolled(1);
+    } else if (offset >= getSize().y) {
+        scrolled(-1);
+    }
+    uint lcaret = caret - label->getTextLineOffset(line);
+    int realoffset = font->calcWidth(input, lcaret)-int(textOffset)+2;
+    if (realoffset-width > 0) {
+        setTextOffset(textOffset + realoffset-width);
+    } else if (realoffset < 0) {
+        setTextOffset(std::max(textOffset + realoffset, 0U));
+    }
+}
diff --git a/src/graphics/ui/elements/control/TextBox.hpp b/src/graphics/ui/elements/control/TextBox.hpp
new file mode 100644
index 00000000..548bcb84
--- /dev/null
+++ b/src/graphics/ui/elements/control/TextBox.hpp
@@ -0,0 +1,149 @@
+#ifndef GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
+#define GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
+
+#include "../layout/Panel.hpp"
+#include "../display/Label.hpp"
+
+class Font;
+
+namespace gui {
+    class Label;
+    
+    class TextBox : public Panel {
+    protected:
+        glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
+        glm::vec4 invalidColor {0.1f, 0.05f, 0.03f, 1.0f};
+        std::shared_ptr<Label> label;
+        std::wstring input;
+        std::wstring placeholder;
+        wstringsupplier supplier = nullptr;
+        wstringconsumer consumer = nullptr;
+        wstringchecker validator = nullptr;
+        runnable onEditStart = nullptr;
+        bool valid = true;
+        /// @brief text input pointer, value may be greather than text length
+        uint caret = 0;
+        /// @brief actual local (line) position of the caret on vertical move
+        uint maxLocalCaret = 0;
+        uint textOffset = 0;
+        int textInitX;
+        /// @brief last time of the caret was moved (used for blink animation)
+        double caretLastMove = 0.0;
+        Font* font = nullptr;
+
+        size_t selectionStart = 0;
+        size_t selectionEnd = 0;
+        size_t selectionOrigin = 0;
+
+        bool multiline = false;
+        bool editable = true;
+
+        size_t normalizeIndex(int index);
+
+        int calcIndexAt(int x, int y) const;
+        void paste(const std::wstring& text);
+        void setTextOffset(uint x);
+        void erase(size_t start, size_t length);
+        bool eraseSelected();
+        void resetSelection();
+        void extendSelection(int index);
+        size_t getLineLength(uint line) const;
+
+        /// @brief Get total length of the selection 
+        size_t getSelectionLength() const;
+
+        /// @brief Set maxLocalCaret to local (line) caret position
+        void resetMaxLocalCaret();
+
+        void performEditingKeyboardEvents(keycode key);
+    public:
+        TextBox(
+            std::wstring placeholder, 
+            glm::vec4 padding=glm::vec4(4.0f)
+        );
+
+        virtual void setTextSupplier(wstringsupplier supplier);
+
+        /// @brief Consumer called on stop editing text (textbox defocus)
+        /// @param consumer std::wstring consumer function
+        virtual void setTextConsumer(wstringconsumer consumer);
+
+        /// @brief Text validator called while text editing and returns true if
+        /// text is valid
+        /// @param validator std::wstring consumer returning boolean 
+        virtual void setTextValidator(wstringchecker validator);
+
+        virtual void setFocusedColor(glm::vec4 color);
+        virtual glm::vec4 getFocusedColor() const;
+
+        /// @brief Set color of textbox marked by validator as invalid
+        virtual void setErrorColor(glm::vec4 color);
+
+        /// @brief Get color of textbox marked by validator as invalid
+        virtual glm::vec4 getErrorColor() const;
+        
+        /// @brief Get TextBox content text or placeholder if empty
+        virtual std::wstring getText() const;
+
+        /// @brief Set TextBox content text
+        virtual void setText(std::wstring value);
+
+        /// @brief Get text placeholder
+        virtual std::wstring getPlaceholder() const;
+
+        /// @brief Set text placeholder
+        /// @param text will be used instead of empty
+        virtual void setPlaceholder(const std::wstring& text);
+        
+        /// @brief Get selected text
+        virtual std::wstring getSelection() const;
+
+        /// @brief Get current caret position in text
+        /// @return integer in range [0, text.length()]
+        virtual uint getCaret() const;
+
+        /// @brief Set caret position in the text
+        /// @param position integer in range [0, text.length()]
+        virtual void setCaret(uint position);
+
+        /// @brief Select part of the text
+        /// @param start index of the first selected character
+        /// @param end index of the last selected character + 1
+        virtual void select(int start, int end);
+
+        /// @brief Check text with validator set with setTextValidator
+        /// @return true if text is valid
+        virtual bool validate();
+
+        virtual void setValid(bool valid);
+        virtual bool isValid() const;
+
+        /// @brief Enable/disable multiline mode        
+        virtual void setMultiline(bool multiline);
+
+        /// @brief Check if multiline mode is enabled 
+        virtual bool isMultiline() const;
+
+        /// @brief Enable/disable text editing feature
+        virtual void setEditable(bool editable);
+
+        /// @brief Check if text editing feature is enabled 
+        virtual bool isEditable() const;
+
+        /// @brief Set runnable called on textbox focus
+        virtual void setOnEditStart(runnable oneditstart);
+
+        virtual void onFocus(GUI*) override;
+        virtual void refresh() override;
+        virtual void click(GUI*, int, int) override;
+        virtual void mouseMove(GUI*, int x, int y) override;
+        virtual bool isFocuskeeper() const override {return true;}
+        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
+        virtual void typed(unsigned int codepoint) override; 
+        virtual void keyPressed(keycode key) override;
+        virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_TEXTBOX_HPP_
diff --git a/src/graphics/ui/elements/control/TrackBar.cpp b/src/graphics/ui/elements/control/TrackBar.cpp
new file mode 100644
index 00000000..17c009d9
--- /dev/null
+++ b/src/graphics/ui/elements/control/TrackBar.cpp
@@ -0,0 +1,114 @@
+#include "TrackBar.hpp"
+
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../../../../assets/Assets.h"
+
+using namespace gui;
+
+TrackBar::TrackBar(
+    double min, 
+    double max, 
+    double value, 
+    double step, 
+    int trackWidth
+) : UINode(glm::vec2(26)), 
+    min(min), 
+    max(max), 
+    value(value), 
+    step(step), 
+    trackWidth(trackWidth) 
+{
+    setColor(glm::vec4(0.f, 0.f, 0.f, 0.4f));
+    setHoverColor(glm::vec4(0.01f, 0.02f, 0.03f, 0.5f));
+}
+
+void TrackBar::draw(const GfxContext* pctx, Assets* assets) {
+    if (supplier) {
+        value = supplier();
+    }
+    glm::vec2 pos = calcPos();
+    auto batch = pctx->getBatch2D();
+    batch->texture(nullptr);
+    batch->setColor(hover ? hoverColor : color);
+    batch->rect(pos.x, pos.y, size.x, size.y);
+
+    float width = size.x;
+    float t = (value - min) / (max-min+trackWidth*step);
+
+    batch->setColor(trackColor);
+    int actualWidth = size.x * (trackWidth / (max-min+trackWidth*step) * step);
+    batch->rect(pos.x + width * t, pos.y, actualWidth, size.y);
+}
+
+void TrackBar::setSupplier(doublesupplier supplier) {
+    this->supplier = supplier;
+}
+
+void TrackBar::setConsumer(doubleconsumer consumer) {
+    this->consumer = consumer;
+}
+
+void TrackBar::mouseMove(GUI*, int x, int y) {
+    glm::vec2 pos = calcPos();
+    value = x;
+    value -= pos.x;
+    value = (value)/size.x * (max-min+trackWidth*step);
+    value += min;
+    value = (value > max) ? max : value;
+    value = (value < min) ? min : value;
+    value = (int64_t)round(value / step) * step;
+
+    if (consumer) {
+        consumer(value);
+    }
+}
+
+
+double TrackBar::getValue() const {
+    return value;
+}
+
+double TrackBar::getMin() const {
+    return min;
+}
+
+double TrackBar::getMax() const {
+    return max;
+}
+
+double TrackBar::getStep() const {
+    return step;
+}
+
+int TrackBar::getTrackWidth() const {
+    return trackWidth;
+}
+
+glm::vec4 TrackBar::getTrackColor() const {
+    return trackColor;
+}
+
+void TrackBar::setValue(double x) {
+    value = x;
+}
+
+void TrackBar::setMin(double x) {
+    min = x;
+}
+
+void TrackBar::setMax(double x) {
+    max = x;
+}
+
+void TrackBar::setStep(double x) {
+    step = x;
+}
+
+void TrackBar::setTrackWidth(int width) {
+    trackWidth = width;
+}
+
+void TrackBar::setTrackColor(glm::vec4 color) {
+    trackColor = color;
+}
diff --git a/src/graphics/ui/elements/control/TrackBar.hpp b/src/graphics/ui/elements/control/TrackBar.hpp
new file mode 100644
index 00000000..00b3b71d
--- /dev/null
+++ b/src/graphics/ui/elements/control/TrackBar.hpp
@@ -0,0 +1,46 @@
+#ifndef GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
+#define GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
+
+#include "../UINode.h"
+
+namespace gui {
+    class TrackBar : public UINode {
+    protected:
+        glm::vec4 trackColor {1.0f, 1.0f, 1.0f, 0.4f};
+        doublesupplier supplier = nullptr;
+        doubleconsumer consumer = nullptr;
+        double min;
+        double max;
+        double value;
+        double step;
+        int trackWidth;
+    public:
+        TrackBar(double min, 
+                 double max, 
+                 double value, 
+                 double step=1.0, 
+                 int trackWidth=1);
+        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+
+        virtual void setSupplier(doublesupplier supplier);
+        virtual void setConsumer(doubleconsumer consumer);
+
+        virtual void mouseMove(GUI*, int x, int y) override;
+
+        virtual double getValue() const;
+        virtual double getMin() const;
+        virtual double getMax() const;
+        virtual double getStep() const;
+        virtual int getTrackWidth() const;
+        virtual glm::vec4 getTrackColor() const;
+
+        virtual void setValue(double);
+        virtual void setMin(double);
+        virtual void setMax(double);
+        virtual void setStep(double);
+        virtual void setTrackWidth(int);
+        virtual void setTrackColor(glm::vec4);
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_TRACKBAR_HPP_
diff --git a/src/graphics/ui/elements/controls.h b/src/graphics/ui/elements/controls.h
deleted file mode 100644
index a0c8b9ef..00000000
--- a/src/graphics/ui/elements/controls.h
+++ /dev/null
@@ -1,371 +0,0 @@
-#ifndef GRAPHICS_UI_ELEMENTS_CONTROLS_H_
-#define GRAPHICS_UI_ELEMENTS_CONTROLS_H_
-
-// TODO: move elements to different files
-
-#include <string>
-#include <memory>
-#include <vector>
-#include <functional>
-#include <glm/glm.hpp>
-
-#include "../GUI.h"
-#include "UINode.h"
-#include "Panel.hpp"
-#include "../../../window/input.h"
-#include "../../../delegates.h"
-#include "../../../typedefs.h"
-
-class Batch2D;
-class Assets;
-class Font;
-
-namespace gui {
-    class Label : public UINode {
-    protected:
-        std::wstring text;
-        std::string fontName;
-        wstringsupplier supplier = nullptr;
-        uint lines = 1;
-        float lineInterval = 1.5f;
-        Align valign = Align::center;
-
-        bool multiline = false;
-
-        // runtime values
-        
-        /// @brief Text Y offset relative to label position
-        /// (last calculated alignment)
-        int textYOffset = 0;
-
-        /// @brief Text line height multiplied by line interval
-        int totalLineHeight = 1;
-    public:
-        Label(std::string text, std::string fontName="normal");
-        Label(std::wstring text, std::string fontName="normal");
-
-        virtual void setText(std::wstring text);
-        const std::wstring& getText() const;
-
-        virtual void setFontName(std::string name);
-        virtual const std::string& getFontName() const;
-
-        /// @brief Set text vertical alignment (default value: center)
-        /// @param align Align::top / Align::center / Align::bottom
-        virtual void setVerticalAlign(Align align);
-        virtual Align getVerticalAlign() const;
-
-        /// @brief Get line height multiplier used for multiline labels 
-        /// (default value: 1.5)
-        virtual float getLineInterval() const;
-
-        /// @brief Set line height multiplier used for multiline labels
-        virtual void setLineInterval(float interval);
-
-        /// @brief Get Y position of the text relative to label position
-        /// @return Y offset
-        virtual int getTextYOffset() const;
-
-        /// @brief Get Y position of the line relative to label position
-        /// @param line target line index
-        /// @return Y offset
-        virtual int getLineYOffset(uint line) const;
-
-        /// @brief Get position of line start in the text
-        /// @param line target line index
-        /// @return position in the text [0..length]
-        virtual size_t getTextLineOffset(uint line) const;
-
-        /// @brief Get line index by its Y offset relative to label position
-        /// @param offset target Y offset
-        /// @return line index [0..+]
-        virtual uint getLineByYOffset(int offset) const;
-        virtual uint getLineByTextIndex(size_t index) const;
-        virtual uint getLinesNumber() const;
-
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-
-        virtual void textSupplier(wstringsupplier supplier);
-
-        virtual void setMultiline(bool multiline);
-        virtual bool isMultiline() const;
-    };
-
-    class Image : public UINode {
-    protected:
-        std::string texture;
-        bool autoresize = false;
-    public:
-        Image(std::string texture, glm::vec2 size=glm::vec2(32,32));
-
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-
-        virtual void setAutoResize(bool flag);
-        virtual bool isAutoResize() const;
-    };
-
-    class Button : public Panel {
-    protected:
-        std::shared_ptr<Label> label = nullptr;
-    public:
-        Button(std::shared_ptr<UINode> content, 
-               glm::vec4 padding=glm::vec4(2.0f));
-               
-        Button(std::wstring text, 
-               glm::vec4 padding,
-               onaction action,
-               glm::vec2 size=glm::vec2(-1));
-
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
-
-        virtual Align getTextAlign() const;
-        virtual void setTextAlign(Align align);
-
-        virtual void setText(std::wstring text);
-        virtual std::wstring getText() const;
-
-        virtual Button* textSupplier(wstringsupplier supplier);
-
-        virtual void refresh() override;
-    };
-    
-    class TextBox : public Panel {
-    protected:
-        glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
-        glm::vec4 invalidColor {0.1f, 0.05f, 0.03f, 1.0f};
-        std::shared_ptr<Label> label;
-        std::wstring input;
-        std::wstring placeholder;
-        wstringsupplier supplier = nullptr;
-        wstringconsumer consumer = nullptr;
-        wstringchecker validator = nullptr;
-        runnable onEditStart = nullptr;
-        bool valid = true;
-        /// @brief text input pointer, value may be greather than text length
-        uint caret = 0;
-        /// @brief actual local (line) position of the caret on vertical move
-        uint maxLocalCaret = 0;
-        uint textOffset = 0;
-        int textInitX;
-        /// @brief last time of the caret was moved (used for blink animation)
-        double caretLastMove = 0.0;
-        Font* font = nullptr;
-
-        size_t selectionStart = 0;
-        size_t selectionEnd = 0;
-        size_t selectionOrigin = 0;
-
-        bool multiline = false;
-        bool editable = true;
-
-        size_t normalizeIndex(int index);
-
-        int calcIndexAt(int x, int y) const;
-        void paste(const std::wstring& text);
-        void setTextOffset(uint x);
-        void erase(size_t start, size_t length);
-        bool eraseSelected();
-        void resetSelection();
-        void extendSelection(int index);
-        size_t getLineLength(uint line) const;
-
-        /// @brief Get total length of the selection 
-        size_t getSelectionLength() const;
-
-        /// @brief Set maxLocalCaret to local (line) caret position
-        void resetMaxLocalCaret();
-
-        void performEditingKeyboardEvents(keycode key);
-    public:
-        TextBox(
-            std::wstring placeholder, 
-            glm::vec4 padding=glm::vec4(4.0f)
-        );
-
-        virtual void setTextSupplier(wstringsupplier supplier);
-
-        /// @brief Consumer called on stop editing text (textbox defocus)
-        /// @param consumer std::wstring consumer function
-        virtual void setTextConsumer(wstringconsumer consumer);
-
-        /// @brief Text validator called while text editing and returns true if
-        /// text is valid
-        /// @param validator std::wstring consumer returning boolean 
-        virtual void setTextValidator(wstringchecker validator);
-
-        virtual void setFocusedColor(glm::vec4 color);
-        virtual glm::vec4 getFocusedColor() const;
-
-        /// @brief Set color of textbox marked by validator as invalid
-        virtual void setErrorColor(glm::vec4 color);
-
-        /// @brief Get color of textbox marked by validator as invalid
-        virtual glm::vec4 getErrorColor() const;
-        
-        /// @brief Get TextBox content text or placeholder if empty
-        virtual std::wstring getText() const;
-
-        /// @brief Set TextBox content text
-        virtual void setText(std::wstring value);
-
-        /// @brief Get text placeholder
-        virtual std::wstring getPlaceholder() const;
-
-        /// @brief Set text placeholder
-        /// @param text will be used instead of empty
-        virtual void setPlaceholder(const std::wstring& text);
-        
-        /// @brief Get selected text
-        virtual std::wstring getSelection() const;
-
-        /// @brief Get current caret position in text
-        /// @return integer in range [0, text.length()]
-        virtual uint getCaret() const;
-
-        /// @brief Set caret position in the text
-        /// @param position integer in range [0, text.length()]
-        virtual void setCaret(uint position);
-
-        /// @brief Select part of the text
-        /// @param start index of the first selected character
-        /// @param end index of the last selected character + 1
-        virtual void select(int start, int end);
-
-        /// @brief Check text with validator set with setTextValidator
-        /// @return true if text is valid
-        virtual bool validate();
-
-        virtual void setValid(bool valid);
-        virtual bool isValid() const;
-
-        /// @brief Enable/disable multiline mode        
-        virtual void setMultiline(bool multiline);
-
-        /// @brief Check if multiline mode is enabled 
-        virtual bool isMultiline() const;
-
-        /// @brief Enable/disable text editing feature
-        virtual void setEditable(bool editable);
-
-        /// @brief Check if text editing feature is enabled 
-        virtual bool isEditable() const;
-
-        /// @brief Set runnable called on textbox focus
-        virtual void setOnEditStart(runnable oneditstart);
-
-        virtual void onFocus(GUI*) override;
-        virtual void refresh() override;
-        virtual void click(GUI*, int, int) override;
-        virtual void mouseMove(GUI*, int x, int y) override;
-        virtual bool isFocuskeeper() const override {return true;}
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
-        virtual void typed(unsigned int codepoint) override; 
-        virtual void keyPressed(keycode key) override;
-        virtual std::shared_ptr<UINode> getAt(glm::vec2 pos, std::shared_ptr<UINode> self) override;
-    };
-
-    class InputBindBox : public Panel {
-    protected:
-        glm::vec4 hoverColor {0.05f, 0.1f, 0.2f, 0.75f};
-        glm::vec4 focusedColor {0.0f, 0.0f, 0.0f, 1.0f};
-        std::shared_ptr<Label> label;
-        Binding& binding;
-    public:
-        InputBindBox(Binding& binding, glm::vec4 padding=glm::vec4(6.0f));
-        virtual void drawBackground(const GfxContext* pctx, Assets* assets) override;
-
-        virtual void clicked(GUI*, mousecode button) override;
-        virtual void keyPressed(keycode key) override;
-        virtual bool isFocuskeeper() const override {return true;}
-    };
-
-    class TrackBar : public UINode {
-    protected:
-        glm::vec4 trackColor {1.0f, 1.0f, 1.0f, 0.4f};
-        doublesupplier supplier = nullptr;
-        doubleconsumer consumer = nullptr;
-        double min;
-        double max;
-        double value;
-        double step;
-        int trackWidth;
-    public:
-        TrackBar(double min, 
-                 double max, 
-                 double value, 
-                 double step=1.0, 
-                 int trackWidth=1);
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-
-        virtual void setSupplier(doublesupplier supplier);
-        virtual void setConsumer(doubleconsumer consumer);
-
-        virtual void mouseMove(GUI*, int x, int y) override;
-
-        virtual double getValue() const;
-        virtual double getMin() const;
-        virtual double getMax() const;
-        virtual double getStep() const;
-        virtual int getTrackWidth() const;
-        virtual glm::vec4 getTrackColor() const;
-
-        virtual void setValue(double);
-        virtual void setMin(double);
-        virtual void setMax(double);
-        virtual void setStep(double);
-        virtual void setTrackWidth(int);
-        virtual void setTrackColor(glm::vec4);
-    };
-
-    class CheckBox : public UINode {
-    protected:
-        glm::vec4 hoverColor {0.05f, 0.1f, 0.2f, 0.75f};
-        glm::vec4 checkColor {1.0f, 1.0f, 1.0f, 0.4f};
-        boolsupplier supplier = nullptr;
-        boolconsumer consumer = nullptr;
-        bool checked = false;
-    public:
-        CheckBox(bool checked=false);
-
-        virtual void draw(const GfxContext* pctx, Assets* assets) override;
-
-        virtual void mouseRelease(GUI*, int x, int y) override;
-
-        virtual void setSupplier(boolsupplier supplier);
-        virtual void setConsumer(boolconsumer consumer);
-
-        virtual CheckBox* setChecked(bool flag);
-
-        virtual bool isChecked() const {
-            if (supplier)
-                return supplier();
-            return checked;
-        }
-    };
-
-    class FullCheckBox : public Panel {
-    protected:
-        std::shared_ptr<CheckBox> checkbox;
-    public:
-        FullCheckBox(std::wstring text, glm::vec2 size, bool checked=false);
-
-        virtual void setSupplier(boolsupplier supplier) {
-            checkbox->setSupplier(supplier);
-        }
-
-        virtual void setConsumer(boolconsumer consumer) {
-            checkbox->setConsumer(consumer);
-        }
-
-        virtual void setChecked(bool flag) {
-            checkbox->setChecked(flag);
-        }
-
-        virtual bool isChecked() const {
-            return checkbox->isChecked();
-        }
-    };
-}
-
-#endif // GRAPHICS_UI_ELEMENTS_CONTROLS_H_
diff --git a/src/graphics/ui/elements/display/Image.cpp b/src/graphics/ui/elements/display/Image.cpp
new file mode 100644
index 00000000..b208b1b0
--- /dev/null
+++ b/src/graphics/ui/elements/display/Image.cpp
@@ -0,0 +1,35 @@
+#include "Image.hpp"
+
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../../../core/Texture.h"
+#include "../../../../assets/Assets.h"
+#include "../../../../maths/UVRegion.h"
+
+using namespace gui;
+
+Image::Image(std::string texture, glm::vec2 size) : UINode(size), texture(texture) {
+    setInteractive(false);
+}
+
+void Image::draw(const GfxContext* pctx, Assets* assets) {
+    glm::vec2 pos = calcPos();
+    glm::vec4 color = getColor();
+    auto batch = pctx->getBatch2D();
+    
+    auto texture = assets->getTexture(this->texture);
+    if (texture && autoresize) {
+        setSize(glm::vec2(texture->getWidth(), texture->getHeight()));
+    }
+    batch->texture(texture);
+    batch->setColor(color);
+    batch->rect(pos.x, pos.y, size.x, size.y, 
+                0, 0, 0, UVRegion(), false, true, color);
+}
+
+void Image::setAutoResize(bool flag) {
+    autoresize = flag;
+}
+bool Image::isAutoResize() const {
+    return autoresize;
+}
diff --git a/src/graphics/ui/elements/display/Image.hpp b/src/graphics/ui/elements/display/Image.hpp
new file mode 100644
index 00000000..d2710423
--- /dev/null
+++ b/src/graphics/ui/elements/display/Image.hpp
@@ -0,0 +1,21 @@
+#ifndef GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
+#define GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
+
+#include "../UINode.h"
+
+namespace gui {
+    class Image : public UINode {
+    protected:
+        std::string texture;
+        bool autoresize = false;
+    public:
+        Image(std::string texture, glm::vec2 size=glm::vec2(32,32));
+
+        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+
+        virtual void setAutoResize(bool flag);
+        virtual bool isAutoResize() const;
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_IMAGE_HPP_
diff --git a/src/graphics/ui/elements/display/Label.cpp b/src/graphics/ui/elements/display/Label.cpp
new file mode 100644
index 00000000..c2cb3031
--- /dev/null
+++ b/src/graphics/ui/elements/display/Label.cpp
@@ -0,0 +1,185 @@
+#include "Label.hpp"
+
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
+#include "../../../core/Font.h"
+#include "../../../../assets/Assets.h"
+#include "../../../../util/stringutil.h"
+
+using namespace gui;
+
+Label::Label(std::string text, std::string fontName) 
+  : UINode(glm::vec2(text.length() * 8, 15)), 
+    text(util::str2wstr_utf8(text)), 
+    fontName(fontName) 
+{
+    setInteractive(false);
+}
+
+
+Label::Label(std::wstring text, std::string fontName) 
+  : UINode(glm::vec2(text.length() * 8, 15)), 
+    text(text), 
+    fontName(fontName) 
+{
+    setInteractive(false);
+}
+
+void Label::setText(std::wstring text) {
+    this->text = text;
+    lines = 1;
+    for (size_t i = 0; i < text.length(); i++) {
+        if (text[i] == L'\n') {
+            lines++;
+        }
+    }
+    lines = std::max(lines, 1U);
+}
+
+const std::wstring& Label::getText() const {
+    return text;
+}
+
+void Label::setFontName(std::string name) {
+    this->fontName = name;
+}
+
+const std::string& Label::getFontName() const {
+    return fontName;
+}
+
+void Label::setVerticalAlign(Align align) {
+    this->valign = align;
+}
+
+Align Label::getVerticalAlign() const {
+    return valign;
+}
+
+float Label::getLineInterval() const {
+    return lineInterval;
+}
+
+void Label::setLineInterval(float interval) {
+    lineInterval = interval;
+}
+
+int Label::getTextYOffset() const {
+    return textYOffset;
+}
+
+size_t Label::getTextLineOffset(uint line) const {
+    size_t offset = 0;
+    size_t linesCount = 0;
+    while (linesCount < line && offset < text.length()) {
+        size_t endline = text.find(L'\n', offset);
+        if (endline == std::wstring::npos) {
+            break;
+        }
+        offset = endline+1;
+        linesCount++;
+    }
+    return offset;
+}
+
+int Label::getLineYOffset(uint line) const {
+    return line * totalLineHeight + textYOffset;
+}
+
+uint Label::getLineByYOffset(int offset) const {
+    if (offset < textYOffset) {
+        return 0;
+    }
+    return (offset - textYOffset) / totalLineHeight;
+}
+
+uint Label::getLineByTextIndex(size_t index) const {
+    size_t offset = 0;
+    size_t linesCount = 0;
+    while (offset < index && offset < text.length()) {
+        size_t endline = text.find(L'\n', offset);
+        if (endline == std::wstring::npos) {
+            break;
+        }
+        if (endline+1 > index) {
+            break;
+        }
+        offset = endline+1;
+        linesCount++;
+    }
+    return linesCount;
+}
+
+uint Label::getLinesNumber() const {
+    return lines;
+}
+
+void Label::draw(const GfxContext* pctx, Assets* assets) {
+    if (supplier) {
+        setText(supplier());
+    }
+
+    auto batch = pctx->getBatch2D();
+    auto font = assets->getFont(fontName);
+
+    batch->setColor(getColor());
+
+    uint lineHeight = font->getLineHeight();
+    glm::vec2 size = getSize();
+    glm::vec2 newsize (
+        font->calcWidth(text), 
+        (lines == 1 ? lineHeight : lineHeight*lineInterval)*lines + font->getYOffset()
+    );
+
+    glm::vec2 pos = calcPos();
+    switch (align) {
+        case Align::left:
+            break;
+        case Align::center:
+            pos.x += (size.x-newsize.x)*0.5f;
+            break;
+        case Align::right:
+            pos.x += size.x-newsize.x;
+            break;
+    }
+    switch (valign) {
+        case Align::top:
+            break;
+        case Align::center:
+            pos.y += (size.y-newsize.y)*0.5f;
+            break;
+        case Align::bottom:
+            pos.y += size.y-newsize.y;
+            break;
+    }
+    textYOffset = pos.y-calcPos().y;
+    totalLineHeight = lineHeight * lineInterval;
+
+    if (multiline) {
+        size_t offset = 0;
+        for (uint i = 0; i < lines; i++) {
+            std::wstring_view view(text.c_str()+offset, text.length()-offset);
+            size_t end = view.find(L'\n');
+            if (end != std::wstring::npos) {
+                view = std::wstring_view(text.c_str()+offset, end);
+                offset += end + 1;
+            }
+            font->draw(batch, view, pos.x, pos.y + i * totalLineHeight, FontStyle::none);
+        }
+    } else {
+        font->draw(batch, text, pos.x, pos.y, FontStyle::none);
+    }
+}
+
+void Label::textSupplier(wstringsupplier supplier) {
+    this->supplier = supplier;
+}
+
+
+void Label::setMultiline(bool multiline) {
+    this->multiline = multiline;
+}
+
+bool Label::isMultiline() const {
+    return multiline;
+}
diff --git a/src/graphics/ui/elements/display/Label.hpp b/src/graphics/ui/elements/display/Label.hpp
new file mode 100644
index 00000000..4076ab94
--- /dev/null
+++ b/src/graphics/ui/elements/display/Label.hpp
@@ -0,0 +1,78 @@
+#ifndef GRAPHICS_UI_ELEMENTS_LABEL_HPP_
+#define GRAPHICS_UI_ELEMENTS_LABEL_HPP_
+
+#include "../UINode.h"
+
+namespace gui {
+    class Label : public UINode {
+    protected:
+        std::wstring text;
+        std::string fontName;
+        wstringsupplier supplier = nullptr;
+        uint lines = 1;
+        float lineInterval = 1.5f;
+        Align valign = Align::center;
+
+        bool multiline = false;
+
+        // runtime values
+        
+        /// @brief Text Y offset relative to label position
+        /// (last calculated alignment)
+        int textYOffset = 0;
+
+        /// @brief Text line height multiplied by line interval
+        int totalLineHeight = 1;
+    public:
+        Label(std::string text, std::string fontName="normal");
+        Label(std::wstring text, std::string fontName="normal");
+
+        virtual void setText(std::wstring text);
+        const std::wstring& getText() const;
+
+        virtual void setFontName(std::string name);
+        virtual const std::string& getFontName() const;
+
+        /// @brief Set text vertical alignment (default value: center)
+        /// @param align Align::top / Align::center / Align::bottom
+        virtual void setVerticalAlign(Align align);
+        virtual Align getVerticalAlign() const;
+
+        /// @brief Get line height multiplier used for multiline labels 
+        /// (default value: 1.5)
+        virtual float getLineInterval() const;
+
+        /// @brief Set line height multiplier used for multiline labels
+        virtual void setLineInterval(float interval);
+
+        /// @brief Get Y position of the text relative to label position
+        /// @return Y offset
+        virtual int getTextYOffset() const;
+
+        /// @brief Get Y position of the line relative to label position
+        /// @param line target line index
+        /// @return Y offset
+        virtual int getLineYOffset(uint line) const;
+
+        /// @brief Get position of line start in the text
+        /// @param line target line index
+        /// @return position in the text [0..length]
+        virtual size_t getTextLineOffset(uint line) const;
+
+        /// @brief Get line index by its Y offset relative to label position
+        /// @param offset target Y offset
+        /// @return line index [0..+]
+        virtual uint getLineByYOffset(int offset) const;
+        virtual uint getLineByTextIndex(size_t index) const;
+        virtual uint getLinesNumber() const;
+
+        virtual void draw(const GfxContext* pctx, Assets* assets) override;
+
+        virtual void textSupplier(wstringsupplier supplier);
+
+        virtual void setMultiline(bool multiline);
+        virtual bool isMultiline() const;
+    };
+}
+
+#endif // GRAPHICS_UI_ELEMENTS_LABEL_HPP_
diff --git a/src/graphics/ui/elements/Plotter.cpp b/src/graphics/ui/elements/display/Plotter.cpp
similarity index 89%
rename from src/graphics/ui/elements/Plotter.cpp
rename to src/graphics/ui/elements/display/Plotter.cpp
index 6c20caa7..6f2df04b 100644
--- a/src/graphics/ui/elements/Plotter.cpp
+++ b/src/graphics/ui/elements/display/Plotter.cpp
@@ -1,10 +1,10 @@
 #include "Plotter.hpp"
 
-#include "../../core/Batch2D.h"
-#include "../../core/Font.h"
-#include "../../core/GfxContext.h"
-#include "../../../assets/Assets.h"
-#include "../../../util/stringutil.h"
+#include "../../../core/Batch2D.h"
+#include "../../../core/Font.h"
+#include "../../../core/GfxContext.h"
+#include "../../../../assets/Assets.h"
+#include "../../../../util/stringutil.h"
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/Plotter.hpp b/src/graphics/ui/elements/display/Plotter.hpp
similarity index 94%
rename from src/graphics/ui/elements/Plotter.hpp
rename to src/graphics/ui/elements/display/Plotter.hpp
index 7d47ab5d..db892667 100644
--- a/src/graphics/ui/elements/Plotter.hpp
+++ b/src/graphics/ui/elements/display/Plotter.hpp
@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 #define GRAPHICS_UI_ELEMENTS_PLOTTER_HPP_
 
-#include "UINode.h"
-#include "../../../typedefs.h"
+#include "../UINode.h"
+#include "../../../../typedefs.h"
 
 #include <memory>
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/elements/Container.cpp b/src/graphics/ui/elements/layout/Container.cpp
similarity index 98%
rename from src/graphics/ui/elements/Container.cpp
rename to src/graphics/ui/elements/layout/Container.cpp
index 3eb5fd60..bebc31e2 100644
--- a/src/graphics/ui/elements/Container.cpp
+++ b/src/graphics/ui/elements/layout/Container.cpp
@@ -1,7 +1,7 @@
 #include "Container.hpp"
 
-#include "../../core/GfxContext.h"
-#include "../../core/Batch2D.h"
+#include "../../../core/GfxContext.h"
+#include "../../../core/Batch2D.h"
 
 using namespace gui;
 
diff --git a/src/graphics/ui/elements/Container.hpp b/src/graphics/ui/elements/layout/Container.hpp
similarity index 96%
rename from src/graphics/ui/elements/Container.hpp
rename to src/graphics/ui/elements/layout/Container.hpp
index f23c2e2e..e2f3ba48 100644
--- a/src/graphics/ui/elements/Container.hpp
+++ b/src/graphics/ui/elements/layout/Container.hpp
@@ -1,8 +1,8 @@
 #ifndef GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
 #define GRAPHICS_UI_ELEMENTS_CONTAINER_HPP_
 
-#include "UINode.h"
-#include "commons.hpp"
+#include "../UINode.h"
+#include "../commons.hpp"
 
 #include <vector>
 
diff --git a/src/graphics/ui/elements/Menu.cpp b/src/graphics/ui/elements/layout/Menu.cpp
similarity index 100%
rename from src/graphics/ui/elements/Menu.cpp
rename to src/graphics/ui/elements/layout/Menu.cpp
diff --git a/src/graphics/ui/elements/Menu.hpp b/src/graphics/ui/elements/layout/Menu.hpp
similarity index 100%
rename from src/graphics/ui/elements/Menu.hpp
rename to src/graphics/ui/elements/layout/Menu.hpp
diff --git a/src/graphics/ui/elements/Panel.cpp b/src/graphics/ui/elements/layout/Panel.cpp
similarity index 100%
rename from src/graphics/ui/elements/Panel.cpp
rename to src/graphics/ui/elements/layout/Panel.cpp
diff --git a/src/graphics/ui/elements/Panel.hpp b/src/graphics/ui/elements/layout/Panel.hpp
similarity index 97%
rename from src/graphics/ui/elements/Panel.hpp
rename to src/graphics/ui/elements/layout/Panel.hpp
index cde3b12a..a4ba5f0b 100644
--- a/src/graphics/ui/elements/Panel.hpp
+++ b/src/graphics/ui/elements/layout/Panel.hpp
@@ -1,7 +1,7 @@
 #ifndef GRAPHICS_UI_ELEMENTS_PANEL_HPP_
 #define GRAPHICS_UI_ELEMENTS_PANEL_HPP_
 
-#include "commons.hpp"
+#include "../commons.hpp"
 #include "Container.hpp"
 
 namespace gui {
diff --git a/src/graphics/ui/gui_util.cpp b/src/graphics/ui/gui_util.cpp
index cdbf4b2b..abd63dd1 100644
--- a/src/graphics/ui/gui_util.cpp
+++ b/src/graphics/ui/gui_util.cpp
@@ -1,6 +1,7 @@
 #include "gui_util.h"
-#include "elements/controls.h"
-#include "elements/Menu.hpp"
+#include "elements/display/Label.hpp"
+#include "elements/layout/Menu.hpp"
+#include "elements/control/Button.hpp"
 #include "gui_xml.h"
 
 #include <glm/glm.hpp>
diff --git a/src/graphics/ui/gui_xml.cpp b/src/graphics/ui/gui_xml.cpp
index cd3c61e5..a36175cd 100644
--- a/src/graphics/ui/gui_xml.cpp
+++ b/src/graphics/ui/gui_xml.cpp
@@ -3,8 +3,13 @@
 #include <charconv>
 #include <stdexcept>
 
-#include "elements/Panel.hpp"
-#include "elements/controls.h"
+#include "elements/layout/Panel.hpp"
+#include "elements/display/Image.hpp"
+#include "elements/control/Button.hpp"
+#include "elements/control/CheckBox.hpp"
+#include "elements/control/TextBox.hpp"
+#include "elements/control/TrackBar.hpp"
+#include "elements/control/InputBindBox.hpp"
 
 #include "../../frontend/locale/langs.h"
 #include "../../logic/scripting/scripting.h"
diff --git a/src/logic/scripting/lua/libgui.cpp b/src/logic/scripting/lua/libgui.cpp
index 05950450..546c8cfe 100644
--- a/src/logic/scripting/lua/libgui.cpp
+++ b/src/logic/scripting/lua/libgui.cpp
@@ -10,9 +10,12 @@
 #include "../../../assets/Assets.h"
 #include "../../../graphics/ui/gui_util.h"
 #include "../../../graphics/ui/elements/UINode.h"
-#include "../../../graphics/ui/elements/Panel.hpp"
-#include "../../../graphics/ui/elements/Menu.hpp"
-#include "../../../graphics/ui/elements/controls.h"
+#include "../../../graphics/ui/elements/control/Button.hpp"
+#include "../../../graphics/ui/elements/control/CheckBox.hpp"
+#include "../../../graphics/ui/elements/control/TextBox.hpp"
+#include "../../../graphics/ui/elements/control/TrackBar.hpp"
+#include "../../../graphics/ui/elements/layout/Panel.hpp"
+#include "../../../graphics/ui/elements/layout/Menu.hpp"
 #include "../../../frontend/UiDocument.h"
 #include "../../../frontend/locale/langs.h"
 #include "../../../util/stringutil.h"