diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj
index d2abd1f..f64671e 100644
--- a/PanoPainter.vcxproj
+++ b/PanoPainter.vcxproj
@@ -77,7 +77,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;$(IncludePath)</IncludePath>
+    <IncludePath>libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;libs\nanort;$(IncludePath)</IncludePath>
     <LibraryPath>libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;libs\openvr\lib\win64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -87,7 +87,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;$(IncludePath)</IncludePath>
+    <IncludePath>libs\glm;libs\glew-2.0.0\include;libs\stb;libs\tinyxml2;libs\yoga;libs\curl-win\include;libs\jpeg;libs\wacom;libs\bugtrap-client\include;libs\poly2tri\poly2tri;libs\base64;libs\sqlite3;libs\openvr\headers;libs\nanort;$(IncludePath)</IncludePath>
     <LibraryPath>libs\curl-win\lib\dll-$(Configuration)-$(PlatformShortName);libs\glew-2.0.0\lib\Release\$(Platform);libs\bugtrap-client\lib;libs\openvr\lib\win64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/data/layout.xml b/data/layout.xml
index 011c94e..1a5c89a 100644
--- a/data/layout.xml
+++ b/data/layout.xml
@@ -1019,7 +1019,7 @@ Here's a list of what's available in this release.
         </node>
       </border>
       <!-- toolbar -->
-      <border id="toolbar" height="60" width="100%" pad="5" dir="row" color=".2 .2 .2 .6" mouse-capture="true">
+      <border id="toolbar" height="50" width="100%" pad="5" dir="row" color=".2 .2 .2 .6" mouse-capture="true">
         <!--
         <button id="btn-open" width="50" height="100%" margin="0 5 0 0" text="Open"/>
         <button id="btn-save" width="50" height="100%" margin="0 5 0 0" text="Save"/>
@@ -1045,44 +1045,44 @@ Here's a list of what's available in this release.
         </button-custom>
         <!--<button id="btn-anim" width="70" height="100%" margin="1 0 0 10" text="Animate"/>-->
         <node dir="row" justify="center" grow="1">
-          <button-custom id="btn-pen" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-pen" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/pen.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
-          <button-custom id="btn-pick" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-pick" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/picker.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
 
-          <button-custom id="btn-erase" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-erase" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/eraser.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
 
-          <button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>
+          <!--<button id="btn-cam" width="70" height="100%" margin="0 0 0 5" text="Parallax"/>-->
           
-          <button-custom id="btn-line" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-line" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/line.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
-          <button id="btn-grid" width="50" height="100%" margin="0 0 0 5" text="Grid"/>
-          <button id="btn-copy" width="50" height="100%" margin="0 0 0 5" text="Copy"/>
-          <button id="btn-cut" width="50" height="100%" margin="0 0 0 5" text="Cut"/>
+          <button id="btn-grid" width="40" height="100%" margin="0 0 0 5" text="Grid"/>
+          <button id="btn-copy" width="40" height="100%" margin="0 0 0 5" text="Copy"/>
+          <button id="btn-cut" width="40" height="100%" margin="0 0 0 5" text="Cut"/>
           <!-- <button id="btn-fill" width="50" height="100%" margin="0 0 0 0" text="Fill"/> -->
-          <button-custom id="btn-mask-free" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-mask-free" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/sel-free.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
-          <button-custom id="btn-mask-line" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-mask-line" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/sel-poly.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
 
-          <button-custom id="btn-bucket" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-bucket" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/bucket.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
-          <button-custom id="btn-touchlock" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+          <button-custom id="btn-touchlock" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
             <image path="data/ui/notouch.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
         </node>
-        <button-custom id="btn-undo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+        <button-custom id="btn-undo" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
           <image path="data/ui/undo.png" width="100%" height="100%" align="center" justify="flex-end"/>
         </button-custom>
-        <button-custom id="btn-redo" width="50" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
+        <button-custom id="btn-redo" width="40" height="100%" margin="0 0 0 5" thickness="1" border-color="0 0 0 1" pad="2">
           <image path="data/ui/redo.png" width="100%" height="100%" align="center" justify="flex-end"/>
         </button-custom>
         <!--
@@ -1098,7 +1098,7 @@ Here's a list of what's available in this release.
           <button-custom id="btn-stroke" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2">
             <image path="data/ui/stroke.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>
-          <button id="btn-brush-preset" width="50" height="50" margin="0 0 5 0" text="Preset" thickness="1" border-color=".1" pad="2"/>
+          <!--<button id="btn-brush-preset" width="50" height="50" margin="0 0 5 0" text="Preset" thickness="1" border-color=".1" pad="2"/>-->
           <button-custom id="btn-brush" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2">
             <image path="data/ui/brushes.png" width="100%" height="100%" align="center" justify="flex-end"/>
           </button-custom>