diff --git a/stuff/profiles/layouts/rooms/Default/menubar_template.xml b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
index c078576..4fe09af 100644
--- a/stuff/profiles/layouts/rooms/Default/menubar_template.xml
+++ b/stuff/profiles/layouts/rooms/Default/menubar_template.xml
@@ -84,6 +84,8 @@
     <command>MI_CleanupPreview</command>
     <command>MI_CameraTest</command>
     <command>MI_Cleanup</command>
+    <separator/>
+    <command>MI_PencilTest</command>
   </menu>
   <menu title="Level">
     <command>MI_AddFrames</command>
diff --git a/stuff/profiles/layouts/rooms/Default/room1.ini b/stuff/profiles/layouts/rooms/Default/room1.ini
index 0089f65..8abbfaa 100644
--- a/stuff/profiles/layouts/rooms/Default/room1.ini
+++ b/stuff/profiles/layouts/rooms/Default/room1.ini
@@ -1,18 +1,20 @@
 [room]
-hierarchy="-1 0 [ [ [ 5 [ 6 4 ] ] 2 ] [ 1 3 ] 0 ] "
 pane_0\name=Xsheet
-name=Basics
-pane_0\geometry=@Rect(1667 0 253 996)
+pane_0\geometry=@Rect(1518 34 402 962)
 pane_1\name=FilmStrip
-pane_1\geometry=@Rect(1254 0 405 530)
+pane_1\geometry=@Rect(1168 34 342 514)
 pane_2\name=LevelPalette
-pane_2\geometry=@Rect(0 808 1246 188)
+pane_2\geometry=@Rect(421 706 739 290)
+pane_2\viewtype=0
 pane_3\name=StyleEditor
-pane_3\geometry=@Rect(1254 538 405 458)
+pane_3\geometry=@Rect(1168 556 342 440)
 pane_4\name=SceneViewer
-pane_4\geometry=@Rect(43 34 1203 766)
-pane_2\viewtype=0
+pane_4\geometry=@Rect(43 34 1117 664)
 pane_5\name=ToolBar
-pane_5\geometry=@Rect(0 0 35 800)
+pane_5\geometry=@Rect(0 34 35 962)
 pane_6\name=ToolOptions
-pane_6\geometry=@Rect(43 0 1203 26)
+pane_6\geometry=@Rect(0 0 1920 26)
+pane_7\name=StudioPalette
+pane_7\geometry=@Rect(43 706 370 290)
+hierarchy="-1 1 [ 6 [ 5 [ 4 [ 7 2 ] ] [ 1 3 ] 0 ] ] "
+name=Basics
diff --git a/stuff/profiles/layouts/rooms/Default/room2.ini b/stuff/profiles/layouts/rooms/Default/room2.ini
index f927586..f70a529 100644
--- a/stuff/profiles/layouts/rooms/Default/room2.ini
+++ b/stuff/profiles/layouts/rooms/Default/room2.ini
@@ -1,11 +1,13 @@
 [room]
-pane_0\name=ComboViewer
-pane_0\geometry=@Rect(0 0 1075 558)
-pane_1\name=CleanupSettings
-pane_1\geometry=@Rect(1083 0 455 857)
-pane_2\name=Xsheet
-pane_2\geometry=@Rect(0 600 1075 257)
-hierarchy="-1 0 [ [ 0 3 2 ] 1 ] "
-pane_3\name=ToolOptions
+pane_0\name=CleanupSettings
+pane_0\geometry=@Rect(1278 34 642 962)
+pane_1\name=ToolOptions
+pane_1\geometry=@Rect(0 0 1920 26)
+pane_2\name=SceneViewer
+pane_2\geometry=@Rect(43 34 1227 567)
+pane_3\name=ToolBar
+pane_3\geometry=@Rect(0 34 35 962)
+pane_4\name=Xsheet
+pane_4\geometry=@Rect(43 609 1227 387)
+hierarchy="-1 1 [ 1 [ 3 [ 2 4 ] 0 ] ] "
 name=Cleanup
-pane_3\geometry=@Rect(0 566 1075 26)
diff --git a/stuff/profiles/layouts/rooms/Default/room3.ini b/stuff/profiles/layouts/rooms/Default/room3.ini
index 521c253..93fd5b2 100644
--- a/stuff/profiles/layouts/rooms/Default/room3.ini
+++ b/stuff/profiles/layouts/rooms/Default/room3.ini
@@ -1,16 +1,16 @@
 [room]
 pane_0\name=SceneViewer
-pane_0\geometry=@Rect(43 34 984 823)
+pane_0\geometry=@Rect(43 34 1080 962)
 pane_1\name=ToolBar
-pane_1\geometry=@Rect(0 0 35 857)
+pane_1\geometry=@Rect(0 34 35 962)
 pane_2\name=FilmStrip
-pane_2\geometry=@Rect(1344 0 194 857)
+pane_2\geometry=@Rect(1537 34 383 962)
 pane_3\name=ToolOptions
-pane_3\geometry=@Rect(43 0 1293 26)
+pane_3\geometry=@Rect(0 0 1920 26)
 pane_4\name=LevelPalette
-pane_4\geometry=@Rect(1035 34 301 147)
+pane_4\geometry=@Rect(1131 34 398 217)
 pane_4\viewtype=0
 pane_5\name=StyleEditor
-pane_5\geometry=@Rect(1035 189 301 668)
-hierarchy="-1 0 [ 1 [ 3 [ 0 [ 4 5 ] ] ] 2 ] "
+pane_5\geometry=@Rect(1131 259 398 737)
+hierarchy="-1 1 [ 3 [ 1 0 [ 4 5 ] 2 ] ] "
 name=Drawing
diff --git a/stuff/profiles/layouts/rooms/Default/room4.ini b/stuff/profiles/layouts/rooms/Default/room4.ini
index 170d35d..3e3603b 100644
--- a/stuff/profiles/layouts/rooms/Default/room4.ini
+++ b/stuff/profiles/layouts/rooms/Default/room4.ini
@@ -1,18 +1,18 @@
 [room]
 pane_0\name=SceneViewer
-pane_0\geometry=@Rect(43 34 904 487)
+pane_0\geometry=@Rect(43 34 1095 557)
 pane_1\name=ToolBar
-pane_1\geometry=@Rect(0 0 35 857)
+pane_1\geometry=@Rect(0 34 35 962)
 pane_2\name=ToolOptions
-pane_2\geometry=@Rect(43 0 904 26)
+pane_2\geometry=@Rect(0 0 1920 26)
 pane_3\name=Xsheet
-pane_3\geometry=@Rect(955 0 384 522)
+pane_3\geometry=@Rect(1146 34 480 578)
 pane_4\name=FunctionEditor
-pane_4\geometry=@Rect(43 529 904 328)
+pane_4\geometry=@Rect(43 599 1095 397)
 pane_5\name=Schematic
-pane_5\geometry=@Rect(955 530 583 327)
-hierarchy="-1 0 [ 1 [ 2 0 4 ] [ [ 3 6 ] 5 ] ] "
-name=Animation
+pane_5\geometry=@Rect(1146 620 774 376)
 pane_5\viewtype=1
 pane_6\name=FilmStrip
-pane_6\geometry=@Rect(1347 0 191 522)
+pane_6\geometry=@Rect(1634 34 286 578)
+hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 6 ] 5 ] ] ] "
+name=Animation
diff --git a/stuff/profiles/layouts/rooms/Default/room5.ini b/stuff/profiles/layouts/rooms/Default/room5.ini
index 56dd4a7..2b25991 100644
--- a/stuff/profiles/layouts/rooms/Default/room5.ini
+++ b/stuff/profiles/layouts/rooms/Default/room5.ini
@@ -1,20 +1,20 @@
 [room]
 pane_0\name=SceneViewer
-pane_0\geometry=@Rect(43 34 990 534)
+pane_0\geometry=@Rect(43 34 1181 604)
 pane_1\name=ToolBar
-pane_1\geometry=@Rect(0 0 35 857)
+pane_1\geometry=@Rect(0 34 35 962)
 pane_2\name=ToolOptions
-pane_2\geometry=@Rect(43 0 1495 26)
+pane_2\geometry=@Rect(0 0 1920 26)
 pane_3\name=ColorModel
-pane_3\geometry=@Rect(1041 34 245 228)
+pane_3\geometry=@Rect(1232 34 341 278)
 pane_4\name=Xsheet
-pane_4\geometry=@Rect(43 576 990 281)
+pane_4\geometry=@Rect(43 646 1181 350)
 pane_5\name=LevelPalette
-pane_5\geometry=@Rect(1041 270 497 87)
+pane_5\geometry=@Rect(1232 320 688 130)
 pane_5\viewtype=0
 pane_6\name=StyleEditor
-pane_6\geometry=@Rect(1041 365 497 492)
+pane_6\geometry=@Rect(1232 458 688 538)
 pane_7\name=StudioPalette
-pane_7\geometry=@Rect(1294 34 244 228)
-hierarchy="-1 0 [ 1 [ 2 [ [ 0 4 ] [ [ 3 7 ] 5 6 ] ] ] ] "
-name=Pltedit
+pane_7\geometry=@Rect(1581 34 339 278)
+hierarchy="-1 1 [ 2 [ 1 [ 0 4 ] [ [ 3 7 ] 5 6 ] ] ] "
+name=Palette
diff --git a/stuff/profiles/layouts/rooms/Default/room6.ini b/stuff/profiles/layouts/rooms/Default/room6.ini
index 582fbad..140070d 100644
--- a/stuff/profiles/layouts/rooms/Default/room6.ini
+++ b/stuff/profiles/layouts/rooms/Default/room6.ini
@@ -1,9 +1,9 @@
 [room]
 pane_0\name=Xsheet
-pane_0\geometry=@Rect(0 0 913 857)
+pane_0\geometry=@Rect(0 0 1104 996)
 pane_1\name=FunctionEditor
-pane_1\geometry=@Rect(921 417 617 440)
+pane_1\geometry=@Rect(1112 487 808 509)
+pane_2\name=SceneViewer
+pane_2\geometry=@Rect(1112 0 808 479)
 hierarchy="-1 0 [ 0 [ 2 1 ] ] "
 name=Xsheet
-pane_2\name=SceneViewer
-pane_2\geometry=@Rect(921 0 617 409)
diff --git a/stuff/profiles/layouts/rooms/Default/room7.ini b/stuff/profiles/layouts/rooms/Default/room7.ini
index 43f4a25..b2759ed 100644
--- a/stuff/profiles/layouts/rooms/Default/room7.ini
+++ b/stuff/profiles/layouts/rooms/Default/room7.ini
@@ -1,7 +1,7 @@
 [room]
 pane_0\name=Browser
-pane_0\geometry=@Rect(0 0 1538 425)
+pane_0\geometry=@Rect(0 0 1920 495)
 pane_1\name=SceneCast
-pane_1\geometry=@Rect(0 433 1538 424)
+pane_1\geometry=@Rect(0 503 1920 493)
 hierarchy="-1 1 [ 0 1 ] "
 name=Browser
diff --git a/stuff/profiles/layouts/rooms/Default/room8.ini b/stuff/profiles/layouts/rooms/Default/room8.ini
index 62fadef..b3c7f6c 100644
--- a/stuff/profiles/layouts/rooms/Default/room8.ini
+++ b/stuff/profiles/layouts/rooms/Default/room8.ini
@@ -1,7 +1,7 @@
 [room]
 pane_0\name=Tasks
-pane_0\geometry=@Rect(0 0 765 857)
+pane_0\geometry=@Rect(0 0 956 996)
 pane_1\name=BatchServers
-pane_1\geometry=@Rect(773 0 765 857)
+pane_1\geometry=@Rect(964 0 956 996)
 hierarchy="-1 0 [ 0 1 ] "
 name=Farm
diff --git a/toonz/sources/toonz/menubar.cpp b/toonz/sources/toonz/menubar.cpp
index 9efd565..0e15726 100644
--- a/toonz/sources/toonz/menubar.cpp
+++ b/toonz/sources/toonz/menubar.cpp
@@ -1066,8 +1066,8 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
   QMenu *fileMenu = addMenu(tr("File"), fullMenuBar);
   addMenuItem(fileMenu, MI_NewScene);
   addMenuItem(fileMenu, MI_LoadScene);
-  addMenuItem(fileMenu, MI_SaveScene);
   addMenuItem(fileMenu, MI_SaveAll);
+  addMenuItem(fileMenu, MI_SaveScene);
   addMenuItem(fileMenu, MI_SaveSceneAs);
   addMenuItem(fileMenu, MI_OpenRecentScene);
   addMenuItem(fileMenu, MI_RevertScene);
@@ -1171,6 +1171,7 @@ QMenuBar *StackedMenuBar::createFullMenuBar() {
   addMenuItem(scanCleanupMenu, MI_CameraTest);
   addMenuItem(scanCleanupMenu, MI_Cleanup);
   scanCleanupMenu->addSeparator();
+  addMenuItem(scanCleanupMenu, MI_PencilTest);
 #endif
 
   // Menu' LEVEL