diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj
index 0ad5ff6..4284054 100644
--- a/PanoPainter.vcxproj
+++ b/PanoPainter.vcxproj
@@ -112,7 +112,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ENUM_BITFIELDS_NOT_SUPPORTED;DEBUG;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <ExceptionHandling>false</ExceptionHandling>
     </ClCompile>
@@ -153,7 +153,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>ENUM_BITFIELDS_NOT_SUPPORTED;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -189,6 +189,116 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\log.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\Utils.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGConfig.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGEnums.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGLayout.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGMarker.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGNode.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGNodePrint.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGStyle.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGValue.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\Yoga.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</AssemblerListingLocation>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</ObjectFileName>
+      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)yoga\</XMLDocumentationFileName>
+    </ClCompile>
     <ClCompile Include="src\abr.cpp" />
     <ClCompile Include="src\action.cpp" />
     <ClCompile Include="src\app.cpp" />
@@ -310,14 +420,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="libs\yoga\yoga\YGNodeList.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="libs\yoga\yoga\Yoga.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="libs\hash-library\md5.h" />
@@ -394,10 +496,6 @@
     <ClInclude Include="libs\wacom\WinTab\PKTDEF.H" />
     <ClInclude Include="libs\wacom\WinTab\Utils.h" />
     <ClInclude Include="libs\wacom\WinTab\WINTAB.H" />
-    <ClInclude Include="libs\yoga\yoga\YGEnums.h" />
-    <ClInclude Include="libs\yoga\yoga\YGMacros.h" />
-    <ClInclude Include="libs\yoga\yoga\YGNodeList.h" />
-    <ClInclude Include="libs\yoga\yoga\Yoga.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PanoPainter.rc" />
diff --git a/PanoPainter.vcxproj.filters b/PanoPainter.vcxproj.filters
index 21a39d2..9f57f61 100644
--- a/PanoPainter.vcxproj.filters
+++ b/PanoPainter.vcxproj.filters
@@ -258,12 +258,6 @@
     <ClCompile Include="src\node_colorwheel.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
-    <ClCompile Include="libs\yoga\yoga\YGNodeList.c">
-      <Filter>libs\yoga</Filter>
-    </ClCompile>
-    <ClCompile Include="libs\yoga\yoga\Yoga.c">
-      <Filter>libs\yoga</Filter>
-    </ClCompile>
     <ClCompile Include="src\node_panel_grid.cpp">
       <Filter>Source Files\ui</Filter>
     </ClCompile>
@@ -315,6 +309,39 @@
     <ClCompile Include="src\serializer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGConfig.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGEnums.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGLayout.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGMarker.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGNode.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGNodePrint.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGStyle.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\YGValue.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\Yoga.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\log.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="libs\yoga\yoga\Utils.cpp">
+      <Filter>libs\yoga</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\app.h">
@@ -491,18 +518,6 @@
     <ClInclude Include="src\node_scroll.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
-    <ClInclude Include="libs\yoga\yoga\YGEnums.h">
-      <Filter>libs\yoga</Filter>
-    </ClInclude>
-    <ClInclude Include="libs\yoga\yoga\YGMacros.h">
-      <Filter>libs\yoga</Filter>
-    </ClInclude>
-    <ClInclude Include="libs\yoga\yoga\YGNodeList.h">
-      <Filter>libs\yoga</Filter>
-    </ClInclude>
-    <ClInclude Include="libs\yoga\yoga\Yoga.h">
-      <Filter>libs\yoga</Filter>
-    </ClInclude>
     <ClInclude Include="src\node_panel_grid.h">
       <Filter>Header Files\ui</Filter>
     </ClInclude>
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 113217a..8bd9fb3 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -21,8 +21,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 add_library(
 	native-lib SHARED
-	../libs/yoga/yoga/YGNodeList.c
-	../libs/yoga/yoga/Yoga.c
+	../libs/yoga/yoga/log.cpp
+	../libs/yoga/yoga/Utils.cpp
+	../libs/yoga/yoga/YGConfig.cpp
+	../libs/yoga/yoga/YGEnums.cpp
+	../libs/yoga/yoga/YGLayout.cpp
+	../libs/yoga/yoga/YGMarker.cpp
+	../libs/yoga/yoga/YGNode.cpp
+	../libs/yoga/yoga/YGNodePrint.cpp
+	../libs/yoga/yoga/YGStyle.cpp
+	../libs/yoga/yoga/YGValue.cpp
+	../libs/yoga/yoga/Yoga.cpp
 	../libs/tinyxml2/tinyxml2.cpp
 	../libs/jpeg/jpgd.cpp
 	../libs/jpeg/jpge.cpp
diff --git a/data/layout.xml b/data/layout.xml
index d7ec945..42f3e56 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -137,7 +137,7 @@
 
   <!-- PANEL STROKE -->
   <layout id="tpl-panel-stroke">
-    <node width="350" margin="0 0 10 0" rtl="ltr">
+    <node width="350" margin="0 0 10 0">
       <border height="30" pad="5 0 0 0" color=".4" align="center" justify="center" dir="row">
         <node align="center" pad="0 0 0 30" justify="center" height="100%" width="1" grow="1">
           <text text="Brush Settings"/>
@@ -168,7 +168,7 @@
           </node>
           <node dir="col" align="center" grow="1" width="1" flood-events="1">
             <!--<node height="20" pad="1" width="100%" margin="5 0 5 0"><slider-h id="tip-shade" value="1"/></node>-->
-            <node dir="row" margin="5 0 0 0">
+            <node dir="row" margin="5 0 0 0" width="100%">
               <button-custom id="tip-change" width="40" height="40" dir="row" pad="4">
                 <image id="tip-change-thumb" width="32" height="100%"/>
               </button-custom>
@@ -1087,13 +1087,13 @@
   <!-- DIALOG ABOUT -->
   <layout id="about">
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="1">
-      <border thickness="1" border-color=".2" pad="3" max-width="650">
+      <border thickness="1" border-color=".2" pad="3" max-width="650" dir="col" width="80%" height="80%">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
           <text text="About PanoPainter"></text>
         </border>
-        <border width="100%" color="0 0 0 .9" pad="10" dir="col">
+        <border width="100%" height="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
-          <border color=".2" width="100%" height="300">
+          <border color=".2" width="100%" height="1" grow="1">
             <scroll pad="10" margin="5" color=".3 .3 .3 .4" height="100%" dir="col" wrap="0" shrink="1">
               <text margin="0 0 0 5" text=
 "
@@ -1138,8 +1138,8 @@ Roboto Font License:
             </scroll>
           </border>
           <!--footer buttons-->
-          <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
-            <button id="btn-ok" text="Ok" width="100" height="30" margin="0 10 0 0"/>
+          <node height="60" dir="row" justify="flex-end">
+            <button id="btn-ok" text="Ok" width="100" height="30" margin="5 0 0 0"/>
           </node>
         </border>
       </border>
@@ -1149,13 +1149,13 @@ Roboto Font License:
   <!-- DIALOG CHANGELOG -->
   <layout id="changelog">
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
-      <border thickness="1" border-color=".2" pad="3" max-width="650">
-        <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
-          <text text="What's new in PanoPainter"></text>
+      <border thickness="1" border-color=".2" pad="3" max-width="650" dir="col" width="80%" height="80%">
+        <border width="100%" height="30" color=".2 .2 .2 .9" align="center" justify="center">
+          <text text="What's new in PanoPainter"/>
         </border>
-        <border width="100%" color="0 0 0 .9" pad="10" dir="col">
+        <border width="100%" height="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
-          <border color=".2" width="100%" height="400">
+          <border color=".2" width="100%" height="1" grow="1">
             <scroll pad="10" margin="5" color=".3 .3 .3 .4" dir="col" shrink="1">
               <text margin="0 0 0 5" font-size="30" text="0.1.7"/>
               <text margin="10 0 0 5" text=
@@ -1228,8 +1228,8 @@ Here's a list of what's available in this release.
             </scroll>
           </border>
           <!--footer buttons-->
-          <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
-            <button id="btn-ok" text="Ok" width="100" height="30" margin="0 10 0 0"/>
+          <node height="60" dir="row" justify="flex-end">
+            <button id="btn-ok" text="Ok" width="100" height="30" margin="5 0 0 0"/>
           </node>
         </border>
       </border>
@@ -1239,13 +1239,13 @@ Here's a list of what's available in this release.
   <!-- DIALOG USER MANUAL -->
   <layout id="usermanual">
     <border positioning="absolute" position="0 0" color=".4 .4 .4 .8" width="100%" height="100%" align="center" justify="center" mouse-capture="true">
-      <border thickness="1" border-color=".2" pad="3" max-width="650">
+      <border thickness="1" border-color=".2" pad="3" max-width="650" dir="col" width="80%" height="80%">
         <border width="100%" height="30" color=".2 .2 .2 .9" dir="row" align="center" justify="center">
           <text text="PanoPainter User Manual"></text>
         </border>
-        <border width="100%" color="0 0 0 .9" pad="10" dir="col">
+        <border width="100%" height="100%" color="0 0 0 .9" pad="10" dir="col">
           <!--window content-->
-          <border color=".2" width="100%" height="500">
+          <border color=".2" width="100%" height="1" grow="1">
             <scroll pad="10" margin="5" color="1" dir="col" shrink="1">
               <node align="center" margin="10 0 10 0"><text color="0" font-size="30" text="Getting started with PanoPainter"/></node>
               <image path="data/doc/images/panopainter-doc-overview.jpg" width="100%" align="center" justify="flex-end" autosize="1"/>
@@ -1263,8 +1263,8 @@ Here's a list of what's available in this release.
             </scroll>
           </border>
           <!--footer buttons-->
-          <node height="40" grow="1" dir="row" align="flex-end" justify="flex-end">
-            <button id="btn-ok" text="Ok" width="100" height="30" margin="0 10 0 0"/>
+          <node height="60" dir="row" justify="flex-end">
+            <button id="btn-ok" text="Ok" width="100" height="30" margin="5 0 0 0"/>
           </node>
         </border>
       </border>
diff --git a/libs/yoga b/libs/yoga
index 8d74e01..f793ba2 160000
--- a/libs/yoga
+++ b/libs/yoga
@@ -1 +1 @@
-Subproject commit 8d74e01f41f062d732bdc4de34dddf213b0fb173
+Subproject commit f793ba2d6bfa5ef9631b83f34df65d4e2a9ad0a9
diff --git a/src/node.cpp b/src/node.cpp
index f9281cf..a69fdf3 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -124,7 +124,8 @@ kEventResult Node::on_event(Event* e)
 
     if (!skip_children)
     {
-        for (auto it = m_children.rbegin(); it != m_children.rend(); ++it)
+        auto children_copy = m_children; // make a copy for safety
+        for (auto it = children_copy.rbegin(); it != children_copy.rend(); ++it)
         {
             if ((*it)->on_event(e) == kEventResult::Consumed)
             {
@@ -534,6 +535,7 @@ Node&& Node::operator=(Node&& o)
 Node::Node()
 {
     y_node = YGNodeNew();
+    YGNodeSetContext(y_node, this);
     y_placeholder = nullptr;
 }