diff --git a/src/coders/yaml.cpp b/src/coders/yaml.cpp
index a9944ea3..b10d5ce2 100644
--- a/src/coders/yaml.cpp
+++ b/src/coders/yaml.cpp
@@ -308,7 +308,7 @@ dv::value Parser::parseObject(dv::value&& object, int indent) {
         object[std::string(name)] = parseFullValue(indent);
         skipEmptyLines();
     }
-    return object;
+    return std::move(object);
 }
 
 dv::value yaml::parse(std::string_view filename, std::string_view source) {
diff --git a/src/graphics/ui/elements/Button.cpp b/src/graphics/ui/elements/Button.cpp
index bb531889..7600fbd0 100644
--- a/src/graphics/ui/elements/Button.cpp
+++ b/src/graphics/ui/elements/Button.cpp
@@ -34,14 +34,12 @@ Button::Button(
     const onaction& action,
     glm::vec2 size
 )
-    : Panel(gui, 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)
-        );
+    : Panel(gui, size, padding, 0.0f) {
+    if (size.x < 0.0f || size.y < 0.0f) {
+        setContentSize({text.length() * 8, 16});
+    } else {
+        setSize(size);
     }
-    setSize(size);
 
     if (action) {
         listenAction(action);
@@ -50,13 +48,12 @@ Button::Button(
 
     label = std::make_shared<Label>(gui, text);
     label->setAlign(Align::center);
-    label->setSize(
-        size - glm::vec2(padding.z + padding.x, padding.w + padding.y)
-    );
-    label->setInteractive(false);
+    label->setSize(getContentSize());
+    label->setInteractive(true);
     add(label);
-    setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f));
-    setPressedColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.95f));
+    
+    setHoverColor({0.05f, 0.1f, 0.15f, 0.75f});
+    setPressedColor({0.0f, 0.0f, 0.0f, 0.95f});
 }
 
 void Button::setText(std::wstring text) {
@@ -82,9 +79,7 @@ Button* Button::textSupplier(wstringsupplier supplier) {
 void Button::refresh() {
     Panel::refresh();
     if (label) {
-        label->setSize(
-            size - glm::vec2(padding.z + padding.x, padding.w + padding.y)
-        );
+        label->setSize(getContentSize());
     }
 }
 
diff --git a/src/graphics/ui/elements/Panel.cpp b/src/graphics/ui/elements/Panel.cpp
index 095cdb70..dacad58b 100644
--- a/src/graphics/ui/elements/Panel.cpp
+++ b/src/graphics/ui/elements/Panel.cpp
@@ -27,6 +27,17 @@ int Panel::getMinLength() const {
     return minLength;
 }
 
+void Panel::setContentSize(const glm::ivec2& contentSize) {
+    setSize(glm::vec2(
+        glm::max(padding.x + padding.z + contentSize.x, size.x),
+        glm::max(padding.y + padding.w + contentSize.y, size.y)
+    ));
+}
+
+glm::vec2 Panel::getContentSize() const {
+    return size - glm::vec2(padding.z + padding.x, padding.w + padding.y);
+}
+
 void Panel::cropToContent() {
     if (maxLength > 0.0f) {
         setSize(glm::vec2(
diff --git a/src/graphics/ui/elements/Panel.hpp b/src/graphics/ui/elements/Panel.hpp
index 74ff1aa3..834cefe1 100644
--- a/src/graphics/ui/elements/Panel.hpp
+++ b/src/graphics/ui/elements/Panel.hpp
@@ -27,6 +27,12 @@ namespace gui {
 
         virtual void setMinLength(int value);
         int getMinLength() const;
+
+        /// @brief .setSize wrapper automatically applying padding to size
+        /// @param size element size excluding padding
+        void setContentSize(const glm::ivec2& size);
+        /// @return element size excluding padding
+        glm::vec2 getContentSize() const;
     protected:
         int minLength = 0;
         int maxLength = 0;