diff --git a/art/textures/button-red.9.png b/art/textures/button-red.9.png
index 5b6e975e..c6d6276c 100644
Binary files a/art/textures/button-red.9.png and b/art/textures/button-red.9.png differ
diff --git a/art/textures/button-window-bg.9.png b/art/textures/button-window-bg.9.png
index 05c8841a..3e419840 100644
Binary files a/art/textures/button-window-bg.9.png and b/art/textures/button-window-bg.9.png differ
diff --git a/art/textures/icon-close-white.png b/art/textures/icon-close-white.png
index 2687a41d..d0a8ab27 100644
Binary files a/art/textures/icon-close-white.png and b/art/textures/icon-close-white.png differ
diff --git a/art/textures/window.9.png b/art/textures/window.9.png
index f01cb404..87cf08ca 100644
Binary files a/art/textures/window.9.png and b/art/textures/window.9.png differ
diff --git a/assets/style/uiskin.atlas b/assets/style/uiskin.atlas
index d2e919dd..d86cd1d0 100644
--- a/assets/style/uiskin.atlas
+++ b/assets/style/uiskin.atlas
@@ -6,98 +6,98 @@ filter: Nearest,Nearest
 repeat: none
 align-center-horisontal
   rotate: false
-  xy: 235, 386
+  xy: 235, 387
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-center-vertical
   rotate: false
-  xy: 360, 465
+  xy: 360, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-down
   rotate: false
-  xy: 380, 465
+  xy: 380, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-left
   rotate: false
-  xy: 400, 465
+  xy: 400, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-right
   rotate: false
-  xy: 420, 465
+  xy: 420, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-up
   rotate: false
-  xy: 440, 465
+  xy: 440, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-down
   rotate: false
-  xy: 460, 465
+  xy: 460, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-left
   rotate: false
-  xy: 480, 465
+  xy: 480, 466
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-right
   rotate: false
-  xy: 549, 937
+  xy: 549, 938
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-up
   rotate: false
-  xy: 569, 937
+  xy: 569, 938
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 alpha-bar-10px
   rotate: false
-  xy: 520, 981
+  xy: 520, 982
   size: 130, 10
   orig: 130, 10
   offset: 0, 0
   index: -1
 alpha-bar-25px
   rotate: false
-  xy: 520, 993
+  xy: 520, 994
   size: 130, 28
   orig: 130, 28
   offset: 0, 0
   index: -1
 alpha-bar-25px-shifted
   rotate: false
-  xy: 2, 376
+  xy: 2, 377
   size: 130, 28
   orig: 130, 28
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 26, 105
+  xy: 123, 347
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -106,21 +106,21 @@ border
   index: -1
 border-circle
   rotate: false
-  xy: 520, 702
+  xy: 536, 897
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 border-circle-error
   rotate: false
-  xy: 520, 686
+  xy: 534, 796
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 border-error
   rotate: false
-  xy: 22, 243
+  xy: 38, 326
   size: 11, 11
   split: 5, 5, 5, 5
   pad: 1, 1, 1, 1
@@ -129,7 +129,7 @@ border-error
   index: -1
 border-textfield
   rotate: false
-  xy: 347, 455
+  xy: 38, 319
   size: 11, 5
   split: 5, 5, 2, 2
   pad: 5, 5, 1, 1
@@ -138,7 +138,7 @@ border-textfield
   index: -1
 box
   rotate: false
-  xy: 2, 267
+  xy: 2, 292
   size: 17, 30
   split: 8, 8, 23, 6
   orig: 17, 30
@@ -146,21 +146,21 @@ box
   index: -1
 box-colapse-off
   rotate: false
-  xy: 26, 205
+  xy: 22, 268
   size: 11, 11
   orig: 11, 11
   offset: 0, 0
   index: -1
 box-colapse-on
   rotate: false
-  xy: 26, 192
+  xy: 37, 306
   size: 11, 11
   orig: 11, 11
   offset: 0, 0
   index: -1
 button
   rotate: false
-  xy: 520, 741
+  xy: 520, 700
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -169,7 +169,7 @@ button
   index: -1
 button-dark
   rotate: false
-  xy: 504, 487
+  xy: 2, 12
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -178,7 +178,7 @@ button-dark
   index: -1
 button-dark-down
   rotate: false
-  xy: 120, 354
+  xy: 2, 56
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -187,7 +187,7 @@ button-dark-down
   index: -1
 button-dark-over
   rotate: false
-  xy: 134, 358
+  xy: 2, 34
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 4, 3
@@ -196,7 +196,7 @@ button-dark-over
   index: -1
 button-down
   rotate: false
-  xy: 2, 27
+  xy: 536, 913
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -205,7 +205,7 @@ button-down
   index: -1
 button-flat-red
   rotate: false
-  xy: 148, 358
+  xy: 520, 810
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -213,7 +213,7 @@ button-flat-red
   index: -1
 button-flat-red-down
   rotate: false
-  xy: 520, 851
+  xy: 520, 854
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -221,7 +221,7 @@ button-flat-red-down
   index: -1
 button-flat-red-over
   rotate: false
-  xy: 48, 291
+  xy: 520, 832
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -229,7 +229,7 @@ button-flat-red-over
   index: -1
 button-over
   rotate: false
-  xy: 2, 5
+  xy: 520, 788
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -238,7 +238,7 @@ button-over
   index: -1
 button-panel-bg
   rotate: false
-  xy: 520, 829
+  xy: 520, 766
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -247,16 +247,16 @@ button-panel-bg
   index: -1
 button-red
   rotate: false
-  xy: 21, 273
-  size: 12, 24
-  split: 5, 5, 5, 4
+  xy: 520, 680
+  size: 12, 18
+  split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
-  orig: 12, 24
+  orig: 12, 18
   offset: 0, 0
   index: -1
 button-resource
   rotate: false
-  xy: 520, 785
+  xy: 520, 722
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -265,7 +265,7 @@ button-resource
   index: -1
 button-resource-over
   rotate: false
-  xy: 520, 807
+  xy: 520, 744
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -274,37 +274,37 @@ button-resource-over
   index: -1
 button-window-bg
   rotate: false
-  xy: 520, 763
-  size: 12, 20
-  split: 5, 5, 5, 4
+  xy: 520, 660
+  size: 12, 18
+  split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
-  orig: 12, 20
+  orig: 12, 18
   offset: 0, 0
   index: -1
 check-down
   rotate: false
-  xy: 520, 670
+  xy: 534, 780
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-down-on
   rotate: false
-  xy: 520, 654
+  xy: 534, 764
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-off
   rotate: false
-  xy: 520, 638
+  xy: 534, 748
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 textfield
   rotate: false
-  xy: 520, 638
+  xy: 534, 748
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -312,63 +312,63 @@ textfield
   index: -1
 check-on
   rotate: false
-  xy: 520, 622
+  xy: 534, 732
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-on-disabled
   rotate: false
-  xy: 520, 606
+  xy: 534, 716
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-over-off
   rotate: false
-  xy: 520, 590
+  xy: 534, 700
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-over-on
   rotate: false
-  xy: 520, 574
+  xy: 534, 684
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 color-picker-bar-selector
   rotate: false
-  xy: 26, 227
+  xy: 26, 252
   size: 7, 14
   orig: 7, 14
   offset: 0, 0
   index: -1
 color-picker-cross
   rotate: false
-  xy: 684, 951
+  xy: 26, 236
   size: 5, 5
   orig: 5, 5
   offset: 0, 0
   index: -1
 color-picker-selector-horizontal
   rotate: false
-  xy: 154, 342
+  xy: 37, 281
   size: 3, 1
   orig: 3, 1
   offset: 0, 0
   index: -1
 color-picker-selector-vertical
   rotate: false
-  xy: 706, 971
+  xy: 35, 276
   size: 1, 3
   orig: 1, 3
   offset: 0, 0
   index: -1
 cursor
   rotate: false
-  xy: 62, 308
+  xy: 724, 994
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -376,7 +376,7 @@ cursor
   index: -1
 default-pane
   rotate: false
-  xy: 18, 49
+  xy: 18, 78
   size: 5, 3
   split: 1, 1, 1, 1
   orig: 5, 3
@@ -384,7 +384,7 @@ default-pane
   index: -1
 default-pane-noborder
   rotate: false
-  xy: 16, 40
+  xy: 533, 897
   size: 1, 1
   split: 0, 0, 0, 0
   orig: 1, 1
@@ -392,7 +392,7 @@ default-pane-noborder
   index: -1
 default-select
   rotate: false
-  xy: 253, 409
+  xy: 253, 410
   size: 27, 24
   split: 4, 16, 0, 24
   orig: 27, 24
@@ -400,7 +400,7 @@ default-select
   index: -1
 default-select-over
   rotate: false
-  xy: 134, 380
+  xy: 134, 381
   size: 27, 24
   split: 4, 16, 0, 24
   orig: 27, 24
@@ -408,7 +408,7 @@ default-select-over
   index: -1
 default-select-selection
   rotate: false
-  xy: 67, 310
+  xy: 16, 73
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -416,7 +416,7 @@ default-select-selection
   index: -1
 default-select-white
   rotate: false
-  xy: 520, 958
+  xy: 520, 959
   size: 27, 21
   split: 2, 17, 0, 21
   orig: 27, 21
@@ -424,7 +424,7 @@ default-select-white
   index: -1
 default-select-white-over
   rotate: false
-  xy: 331, 486
+  xy: 331, 487
   size: 27, 21
   split: 2, 17, 0, 21
   orig: 27, 21
@@ -432,14 +432,14 @@ default-select-white-over
   index: -1
 dropHere
   rotate: false
-  xy: 2, 406
+  xy: 2, 407
   size: 249, 101
   orig: 249, 101
   offset: 0, 0
   index: -1
 expandable-properties-active-bg
   rotate: false
-  xy: 1018, 984
+  xy: 1018, 985
   size: 4, 17
   split: 1, 2, 0, 17
   orig: 4, 17
@@ -447,21 +447,21 @@ expandable-properties-active-bg
   index: -1
 expandable-properties-collapse-off
   rotate: false
-  xy: 26, 218
+  xy: 347, 454
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-collapse-on
   rotate: false
-  xy: 26, 119
+  xy: 26, 243
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-inactive-bg
   rotate: false
-  xy: 1018, 1003
+  xy: 1018, 1004
   size: 4, 18
   split: 1, 2, 0, 18
   orig: 4, 18
@@ -469,378 +469,378 @@ expandable-properties-inactive-bg
   index: -1
 icon-animation
   rotate: false
-  xy: 730, 999
+  xy: 730, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 684, 974
+  xy: 684, 975
   size: 6, 11
   orig: 6, 11
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 154, 345
+  xy: 274, 397
   size: 6, 11
   orig: 6, 11
   offset: 0, 0
   index: -1
 icon-close
   rotate: false
-  xy: 211, 382
+  xy: 211, 383
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-close-orange
   rotate: false
-  xy: 360, 455
+  xy: 2, 2
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-close-orange-down
   rotate: false
-  xy: 26, 138
+  xy: 12, 2
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-close-orange-over
   rotate: false
-  xy: 370, 455
+  xy: 292, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-close-panel
   rotate: false
-  xy: 2, 243
+  xy: 2, 268
   size: 18, 22
   orig: 18, 22
   offset: 0, 0
   index: -1
 icon-close-small
   rotate: false
-  xy: 536, 874
+  xy: 83, 321
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icon-close-white
   rotate: false
-  xy: 96, 352
-  size: 22, 22
-  orig: 22, 22
+  xy: 2, 104
+  size: 22, 18
+  orig: 22, 18
   offset: 0, 0
   index: -1
 icon-composite
   rotate: false
-  xy: 754, 999
+  xy: 99, 353
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-composite2
   rotate: false
-  xy: 520, 558
+  xy: 534, 668
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-drive
   rotate: false
-  xy: 778, 999
+  xy: 754, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-file-audio
   rotate: false
-  xy: 802, 999
+  xy: 778, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 826, 999
+  xy: 802, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-file-pdf
   rotate: false
-  xy: 850, 999
+  xy: 826, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 874, 999
+  xy: 850, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 898, 999
+  xy: 874, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-folder-new
   rotate: false
-  xy: 922, 999
+  xy: 898, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 946, 999
+  xy: 922, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-folder-star
   rotate: false
-  xy: 970, 999
+  xy: 946, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-group
   rotate: false
-  xy: 994, 999
+  xy: 970, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-image
   rotate: false
-  xy: 360, 485
+  xy: 994, 1000
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-label
   rotate: false
-  xy: 384, 485
+  xy: 360, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-library
   rotate: false
-  xy: 408, 485
+  xy: 384, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-library-over
   rotate: false
-  xy: 432, 485
+  xy: 408, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-link-active
   rotate: false
-  xy: 67, 315
+  xy: 569, 921
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-link-inactive
   rotate: false
-  xy: 331, 436
+  xy: 331, 437
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-list-settings
   rotate: false
-  xy: 456, 485
+  xy: 432, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-lock-active
   rotate: false
-  xy: 480, 485
+  xy: 456, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-lock-inactive
   rotate: false
-  xy: 549, 957
+  xy: 480, 486
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-new-layer
   rotate: false
-  xy: 35, 273
+  xy: 85, 335
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-particle
   rotate: false
-  xy: 573, 957
+  xy: 549, 958
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-particle-over
   rotate: false
-  xy: 597, 957
+  xy: 573, 958
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-particle-white
   rotate: false
-  xy: 621, 957
+  xy: 597, 958
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 2, 219
+  xy: 621, 958
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-root
   rotate: false
-  xy: 520, 542
+  xy: 652, 955
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-spine
   rotate: false
-  xy: 2, 195
+  xy: 2, 244
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-star
   rotate: false
-  xy: 2, 171
+  xy: 2, 220
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-star-outline
   rotate: false
-  xy: 2, 147
+  xy: 2, 196
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 50, 274
+  xy: 669, 971
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-disabled
   rotate: false
-  xy: 39, 256
+  xy: 22, 281
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-over
   rotate: false
-  xy: 669, 970
+  xy: 520, 597
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-unlink-active
   rotate: false
-  xy: 255, 392
+  xy: 51, 335
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-unlink-inactive
   rotate: false
-  xy: 22, 256
+  xy: 68, 335
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 icon-visible-off
   rotate: false
-  xy: 2, 123
+  xy: 2, 172
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-visible-on
   rotate: false
-  xy: 2, 99
+  xy: 2, 148
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-zoomin
   rotate: false
-  xy: 589, 938
+  xy: 589, 939
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomin-disabled
   rotate: false
-  xy: 608, 938
+  xy: 608, 939
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomin-over
   rotate: false
-  xy: 627, 938
+  xy: 627, 939
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout
   rotate: false
-  xy: 48, 332
+  xy: 500, 467
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout-disabled
   rotate: false
-  xy: 67, 332
+  xy: 255, 391
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout-over
   rotate: false
-  xy: 48, 313
+  xy: 550, 919
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 layer-bg
   rotate: false
-  xy: 645, 960
+  xy: 645, 961
   size: 5, 19
   split: 2, 2, 0, 19
   orig: 5, 19
@@ -848,7 +848,7 @@ layer-bg
   index: -1
 layer-bg-over
   rotate: false
-  xy: 18, 54
+  xy: 18, 83
   size: 5, 19
   split: 2, 2, 0, 19
   orig: 5, 19
@@ -856,28 +856,28 @@ layer-bg-over
   index: -1
 list-selection
   rotate: false
-  xy: 22, 46
+  xy: 546, 665
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 list-selection-white
   rotate: false
-  xy: 62, 305
+  xy: 70, 309
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 logo
   rotate: false
-  xy: 681, 998
+  xy: 681, 999
   size: 23, 23
   orig: 23, 23
   offset: 0, 0
   index: -1
 menu-bg
   rotate: false
-  xy: 331, 453
+  xy: 331, 454
   size: 14, 31
   split: 2, 2, 0, 31
   orig: 14, 31
@@ -885,7 +885,7 @@ menu-bg
   index: -1
 menu-bg-down
   rotate: false
-  xy: 520, 899
+  xy: 520, 900
   size: 14, 24
   split: 2, 2, 0, 24
   orig: 14, 24
@@ -893,7 +893,7 @@ menu-bg-down
   index: -1
 menu-bg-over
   rotate: false
-  xy: 2, 49
+  xy: 21, 298
   size: 14, 24
   split: 2, 2, 0, 24
   orig: 14, 24
@@ -901,7 +901,7 @@ menu-bg-over
   index: -1
 menu-bg-up
   rotate: false
-  xy: 520, 873
+  xy: 2, 78
   size: 14, 24
   split: 2, 2, 0, 24
   orig: 14, 24
@@ -909,35 +909,35 @@ menu-bg-up
   index: -1
 myriad-medium
   rotate: false
-  xy: 260, 509
+  xy: 260, 510
   size: 128, 512
   orig: 128, 512
   offset: 0, 0
   index: -1
 myriad-medium-big
   rotate: false
-  xy: 2, 509
+  xy: 2, 510
   size: 256, 512
   orig: 256, 512
   offset: 0, 0
   index: -1
 myriad-medium-small
   rotate: false
-  xy: 390, 509
+  xy: 390, 510
   size: 128, 512
   orig: 128, 512
   offset: 0, 0
   index: -1
 origin-anchor
   rotate: false
-  xy: 681, 987
+  xy: 681, 988
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 padded-list-selection
   rotate: false
-  xy: 255, 387
+  xy: 534, 663
   size: 10, 3
   split: 4, 4, 1, 1
   pad: 4, 4, 0, 0
@@ -946,7 +946,7 @@ padded-list-selection
   index: -1
 panel
   rotate: false
-  xy: 35, 338
+  xy: 38, 339
   size: 11, 36
   split: 3, 3, 33, 2
   orig: 11, 36
@@ -954,7 +954,7 @@ panel
   index: -1
 popup-menu
   rotate: false
-  xy: 711, 977
+  xy: 700, 978
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -962,7 +962,7 @@ popup-menu
   index: -1
 popup-menu-disabled
   rotate: false
-  xy: 724, 993
+  xy: 274, 392
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -970,7 +970,7 @@ popup-menu-disabled
   index: -1
 popup-menu-down
   rotate: false
-  xy: 267, 387
+  xy: 530, 512
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -978,7 +978,7 @@ popup-menu-down
   index: -1
 popup-menu-over
   rotate: false
-  xy: 272, 388
+  xy: 692, 971
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -986,84 +986,84 @@ popup-menu-over
   index: -1
 progressbar
   rotate: false
-  xy: 500, 478
+  xy: 517, 503
   size: 1, 5
   orig: 1, 5
   offset: 0, 0
   index: -1
 progressbar-filled
   rotate: false
-  xy: 530, 734
+  xy: 586, 931
   size: 1, 5
   orig: 1, 5
   offset: 0, 0
   index: -1
 progressbar-filled-vertical
   rotate: false
-  xy: 235, 383
+  xy: 134, 378
   size: 5, 1
   orig: 5, 1
   offset: 0, 0
   index: -1
 progressbar-vertical
   rotate: false
-  xy: 2, 2
+  xy: 235, 384
   size: 5, 1
   orig: 5, 1
   offset: 0, 0
   index: -1
 radio-down
   rotate: false
-  xy: 35, 239
+  xy: 100, 336
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-down-on
   rotate: false
-  xy: 35, 222
+  xy: 652, 971
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-off
   rotate: false
-  xy: 652, 970
+  xy: 533, 880
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-on
   rotate: false
-  xy: 86, 334
+  xy: 534, 863
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-on-disabled
   rotate: false
-  xy: 103, 335
+  xy: 534, 846
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-over-off
   rotate: false
-  xy: 120, 337
+  xy: 534, 829
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-over-on
   rotate: false
-  xy: 137, 341
+  xy: 534, 812
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 scroll
   rotate: false
-  xy: 692, 968
+  xy: 348, 446
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -1071,7 +1071,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 390, 458
+  xy: 692, 976
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -1080,7 +1080,7 @@ scroll-horizontal
   index: -1
 scroll-knob-horizontal
   rotate: false
-  xy: 26, 112
+  xy: 70, 312
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -1089,7 +1089,7 @@ scroll-knob-horizontal
   index: -1
 scroll-knob-vertical
   rotate: false
-  xy: 684, 958
+  xy: 312, 403
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -1097,147 +1097,147 @@ scroll-knob-vertical
   index: -1
 select-box-list-bg
   rotate: false
-  xy: 72, 312
+  xy: 78, 316
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 select-box-list-bg-white
   rotate: false
-  xy: 724, 990
+  xy: 319, 408
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 select-down
   rotate: false
-  xy: 702, 976
+  xy: 552, 897
   size: 7, 4
   orig: 7, 4
   offset: 0, 0
   index: -1
 select-up
   rotate: false
-  xy: 398, 459
+  xy: 550, 891
   size: 7, 4
   orig: 7, 4
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 277, 390
+  xy: 348, 443
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 selection-anchor
   rotate: false
-  xy: 26, 181
+  xy: 37, 295
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 134, 354
+  xy: 356, 459
   size: 1, 2
   orig: 1, 2
   offset: 0, 0
   index: -1
 separator-menu
   rotate: false
-  xy: 134, 354
+  xy: 356, 459
   size: 1, 2
   orig: 1, 2
   offset: 0, 0
   index: -1
 separator-vertical
   rotate: false
-  xy: 390, 455
+  xy: 534, 660
   size: 2, 1
   orig: 2, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 546, 928
+  xy: 530, 654
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 347, 462
+  xy: 347, 463
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-disabled
   rotate: false
-  xy: 536, 934
+  xy: 536, 935
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 35, 314
+  xy: 504, 486
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 35, 290
+  xy: 520, 876
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 137, 338
+  xy: 360, 463
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
   index: -1
 splash_logo
   rotate: false
-  xy: 253, 435
+  xy: 253, 436
   size: 76, 72
   orig: 76, 72
   offset: 0, 0
   index: -1
 splitpane
   rotate: false
-  xy: 549, 934
+  xy: 255, 388
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
   index: -1
 splitpane-over
   rotate: false
-  xy: 35, 219
+  xy: 282, 397
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
   index: -1
 splitpane-vertical
   rotate: false
-  xy: 26, 99
+  xy: 97, 329
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 splitpane-vertical-over
   rotate: false
-  xy: 684, 945
+  xy: 100, 330
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 static-text
   rotate: false
-  xy: 536, 888
+  xy: 520, 614
   size: 7, 21
   split: 3, 3, 0, 21
   orig: 7, 21
@@ -1245,14 +1245,14 @@ static-text
   index: -1
 sub-menu
   rotate: false
-  xy: 678, 945
+  xy: 117, 344
   size: 4, 7
   orig: 4, 7
   offset: 0, 0
   index: -1
 sub-menu-bg
   rotate: false
-  xy: 520, 925
+  xy: 520, 926
   size: 14, 31
   split: 2, 2, 0, 31
   orig: 14, 31
@@ -1260,7 +1260,7 @@ sub-menu-bg
   index: -1
 tab-active
   rotate: false
-  xy: 536, 911
+  xy: 123, 354
   size: 8, 21
   split: 3, 3, 2, 1
   orig: 8, 21
@@ -1268,7 +1268,7 @@ tab-active
   index: -1
 tab-inactive
   rotate: false
-  xy: 520, 718
+  xy: 520, 637
   size: 8, 21
   split: 3, 3, 2, 1
   orig: 8, 21
@@ -1276,7 +1276,7 @@ tab-inactive
   index: -1
 textfield-light
   rotate: false
-  xy: 272, 393
+  xy: 520, 565
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1284,7 +1284,7 @@ textfield-light
   index: -1
 textfield-light-down
   rotate: false
-  xy: 520, 526
+  xy: 668, 955
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1292,7 +1292,7 @@ textfield-light-down
   index: -1
 textfield-light-over
   rotate: false
-  xy: 520, 510
+  xy: 520, 581
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1300,7 +1300,7 @@ textfield-light-over
   index: -1
 textfield-over
   rotate: false
-  xy: 520, 510
+  xy: 520, 581
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1308,7 +1308,7 @@ textfield-over
   index: -1
 thumbnail
   rotate: false
-  xy: 16, 43
+  xy: 678, 949
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1316,7 +1316,7 @@ thumbnail
   index: -1
 thumbnail-over
   rotate: false
-  xy: 646, 954
+  xy: 646, 955
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1324,7 +1324,7 @@ thumbnail-over
   index: -1
 tint-border
   rotate: false
-  xy: 684, 966
+  xy: 684, 967
   size: 6, 6
   split: 2, 2, 2, 2
   orig: 6, 6
@@ -1332,56 +1332,56 @@ tint-border
   index: -1
 tool-align
   rotate: false
-  xy: 163, 381
+  xy: 163, 382
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-conuslight
   rotate: false
-  xy: 282, 410
+  xy: 282, 411
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-label
   rotate: false
-  xy: 48, 351
+  xy: 51, 352
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-mesh
   rotate: false
-  xy: 706, 998
+  xy: 706, 999
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-move
   rotate: false
-  xy: 187, 381
+  xy: 187, 382
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-sphericlight
   rotate: false
-  xy: 306, 410
+  xy: 306, 411
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 tool-transform
   rotate: false
-  xy: 72, 351
+  xy: 75, 352
   size: 22, 23
   orig: 22, 23
   offset: 0, 0
   index: -1
 toolbar-bg
   rotate: false
-  xy: 692, 976
+  xy: 520, 511
   size: 8, 4
   split: 1, 2, 1, 1
   orig: 8, 4
@@ -1389,7 +1389,7 @@ toolbar-bg
   index: -1
 toolbar-down
   rotate: false
-  xy: 26, 170
+  xy: 282, 400
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1397,7 +1397,7 @@ toolbar-down
   index: -1
 toolbar-normal
   rotate: false
-  xy: 26, 159
+  xy: 50, 308
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1405,7 +1405,7 @@ toolbar-normal
   index: -1
 toolbar-over
   rotate: false
-  xy: 26, 148
+  xy: 37, 284
   size: 8, 9
   split: 2, 2, 3, 3
   orig: 8, 9
@@ -1413,7 +1413,7 @@ toolbar-over
   index: -1
 tooltip-bg
   rotate: false
-  xy: 407, 460
+  xy: 589, 934
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -1421,35 +1421,35 @@ tooltip-bg
   index: -1
 touchpad-knob
   rotate: false
-  xy: 2, 75
+  xy: 2, 124
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 tree-minus
   rotate: false
-  xy: 26, 128
+  xy: 60, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tree-over
   rotate: false
-  xy: 716, 979
+  xy: 561, 900
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 tree-plus
   rotate: false
-  xy: 380, 455
+  xy: 302, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tree-selection
   rotate: false
-  xy: 699, 969
+  xy: 684, 960
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -1458,113 +1458,113 @@ tree-selection
   index: -1
 vis-blue
   rotate: false
-  xy: 500, 475
+  xy: 550, 888
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 vis-check
   rotate: false
-  xy: 288, 394
+  xy: 520, 549
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-down
   rotate: false
-  xy: 304, 394
+  xy: 520, 533
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-over
   rotate: false
-  xy: 54, 258
+  xy: 520, 517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick
   rotate: false
-  xy: 652, 954
+  xy: 552, 903
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick-disabled
   rotate: false
-  xy: 668, 954
+  xy: 646, 939
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio
   rotate: false
-  xy: 320, 394
+  xy: 662, 939
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-down
   rotate: false
-  xy: 646, 938
+  xy: 692, 983
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-over
   rotate: false
-  xy: 662, 938
+  xy: 708, 983
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick
   rotate: false
-  xy: 692, 982
+  xy: 51, 319
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick-disabled
   rotate: false
-  xy: 708, 982
+  xy: 67, 319
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-red
   rotate: false
-  xy: 530, 731
+  xy: 117, 341
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 678, 940
+  xy: 520, 506
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 window
   rotate: false
-  xy: 2, 299
-  size: 31, 75
-  split: 6, 6, 32, 7
-  orig: 31, 75
+  xy: 2, 324
+  size: 34, 51
+  split: 16, 16, 29, 20
+  orig: 34, 51
   offset: 0, 0
   index: -1
 window-bg
   rotate: false
-  xy: 242, 383
+  xy: 123, 344
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 window-noborder
   rotate: false
-  xy: 652, 987
+  xy: 652, 988
   size: 27, 34
   split: 5, 4, 26, 3
   orig: 27, 34
diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json
index d5b6c7a1..79dba15a 100644
--- a/assets/style/uiskin.json
+++ b/assets/style/uiskin.json
@@ -440,7 +440,7 @@
     close-window: {
       down: button-red,
       up: button-window-bg,
-      imageUp: icon-close-white
+      imageUp: icon-close-white,
     },
     close-panel: {
       down: button-red,
diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png
index 95a7a693..9601fc04 100644
Binary files a/assets/style/uiskin.png and b/assets/style/uiskin.png differ
diff --git a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/H2DDialog.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/H2DDialog.java
index abce5a21..1cbc91be 100644
--- a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/H2DDialog.java
+++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/H2DDialog.java
@@ -19,9 +19,14 @@
 package games.rednblack.h2d.common;
 
 import com.badlogic.gdx.scenes.scene2d.Action;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.kotcrab.vis.ui.VisUI;
 import com.kotcrab.vis.ui.widget.VisDialog;
+import com.kotcrab.vis.ui.widget.VisImageButton;
 
 public class H2DDialog extends VisDialog {
     protected final Skin skin;
@@ -29,6 +34,7 @@ public class H2DDialog extends VisDialog {
     public H2DDialog(String title) {
         super(title);
         skin = VisUI.getSkin();
+        padTop(32);
     }
 
 	@Override
@@ -43,6 +49,25 @@ public class H2DDialog extends VisDialog {
 		onDismiss();
 	}
 
+	@Override
+	public void addCloseButton() {
+		VisImageButton closeButton = new VisImageButton("close-window");
+		this.getTitleTable().add(closeButton).padRight(0);
+		closeButton.addListener(new ChangeListener() {
+			@Override
+			public void changed (ChangeEvent event, Actor actor) {
+				close();
+			}
+		});
+		closeButton.addListener(new ClickListener() {
+			@Override
+			public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
+				event.cancel();
+				return true;
+			}
+		});
+	}
+
 	@Override
 	protected void close () {
 		super.close();
diff --git a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/UIDraggablePanel.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/UIDraggablePanel.java
index 6fa4e52c..01393131 100644
--- a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/UIDraggablePanel.java
+++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/UIDraggablePanel.java
@@ -48,10 +48,17 @@ public class UIDraggablePanel extends H2DDialog {
     public void addCloseButton() {
         VisImageButton closeButton = new VisImageButton("close-panel");
         this.getTitleTable().add(closeButton).padTop(1).padRight(-2);
+        closeButton.addListener(new ChangeListener() {
+            @Override
+            public void changed (ChangeEvent event, Actor actor) {
+                close();
+            }
+        });
         closeButton.addListener(new ClickListener() {
             @Override
-            public void clicked(InputEvent event, float x, float y) {
-                UIDraggablePanel.this.close();
+            public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
+                event.cancel();
+                return true;
             }
         });
     }
@@ -65,16 +72,13 @@ public class UIDraggablePanel extends H2DDialog {
 
     @Override
     public VisDialog show(Stage stage) {
-
         isOpen = true;
-
         return super.show(stage);
     }
 
     @Override
     public void hide() {
         super.hide();
-
         isOpen = false;
     }
 }
diff --git a/src/main/java/games/rednblack/editor/controller/commands/NonRevertibleCommand.java b/src/main/java/games/rednblack/editor/controller/commands/NonRevertibleCommand.java
index 7c8b783c..a153740e 100644
--- a/src/main/java/games/rednblack/editor/controller/commands/NonRevertibleCommand.java
+++ b/src/main/java/games/rednblack/editor/controller/commands/NonRevertibleCommand.java
@@ -38,7 +38,7 @@ public abstract class NonRevertibleCommand extends SandboxCommand {
                         if (r == 1) {
                             callDoAction();
                         }
-                    });
+                    }).padBottom(20).pack();
         } else {
             callDoAction();
         }
diff --git a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java
index ab413ed0..5b322d93 100644
--- a/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java
+++ b/src/main/java/games/rednblack/editor/controller/commands/resource/ExportLibraryItemCommand.java
@@ -16,6 +16,7 @@ import games.rednblack.editor.proxy.ResourceManager;
 import games.rednblack.editor.renderer.data.*;
 import games.rednblack.editor.utils.ImportUtils;
 import games.rednblack.editor.utils.ZipUtils;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser;
 import games.rednblack.h2d.common.MsgAPI;
 import games.rednblack.h2d.common.vo.ExportMapperVO;
 import games.rednblack.h2d.common.vo.ExportMapperVO.ExportedAsset;
@@ -49,7 +50,7 @@ public class ExportLibraryItemCommand extends NonRevertibleCommand {
 
         String libraryItemName = notification.getBody();
 
-        FileChooser fileChooser = new FileChooser(FileChooser.Mode.SAVE);
+        FileChooser fileChooser = new HyperLapFileChooser(FileChooser.Mode.SAVE);
         FileTypeFilter typeFilter = new FileTypeFilter(false);
         typeFilter.addRule("HyperLap2D Library (*.h2dlib)", "h2dlib");
         fileChooser.setFileTypeFilter(typeFilter);
diff --git a/src/main/java/games/rednblack/editor/utils/AssetImporter.java b/src/main/java/games/rednblack/editor/utils/AssetImporter.java
index 3a8d7792..01333353 100644
--- a/src/main/java/games/rednblack/editor/utils/AssetImporter.java
+++ b/src/main/java/games/rednblack/editor/utils/AssetImporter.java
@@ -53,7 +53,7 @@ public class AssetImporter {
                             if (result == 0) {
                                 initImport(type, paths, false);
                             }
-                        });
+                        }).padBottom(20).pack();
             } else {
                 initImport(type, paths, false);
             }
diff --git a/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java b/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java
index d8b3fb6b..dde387e0 100644
--- a/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java
+++ b/src/main/java/games/rednblack/editor/view/menu/HyperLap2DMenuBarMediator.java
@@ -22,6 +22,7 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.Array;
 import com.kotcrab.vis.ui.widget.file.FileTypeFilter;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser;
 import games.rednblack.h2d.common.MsgAPI;
 import com.kotcrab.vis.ui.util.dialog.Dialogs;
 import com.kotcrab.vis.ui.util.dialog.InputDialogListener;
@@ -180,7 +181,7 @@ public class HyperLap2DMenuBarMediator extends SimpleMediator<HyperLap2DMenuBar>
     public void showOpenProject() {
         Sandbox sandbox = Sandbox.getInstance();
         //chooser creation
-        FileChooser fileChooser = new FileChooser(FileChooser.Mode.OPEN);
+        FileChooser fileChooser = new HyperLapFileChooser(FileChooser.Mode.OPEN);
 
         FileTypeFilter typeFilter = new FileTypeFilter(false);
         typeFilter.addRule("HyperLap2D Project (*.pit)", "pit");
diff --git a/src/main/java/games/rednblack/editor/view/ui/FollowersUIMediator.java b/src/main/java/games/rednblack/editor/view/ui/FollowersUIMediator.java
index 06e2c8ed..cff93960 100644
--- a/src/main/java/games/rednblack/editor/view/ui/FollowersUIMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/FollowersUIMediator.java
@@ -144,7 +144,8 @@ public class FollowersUIMediator extends SimpleMediator<FollowersUI> {
     private void setNewSelectionConfiguration(Set<Entity> items) {
         followers.values().forEach(games.rednblack.editor.view.ui.followers.BasicFollower::hide);
         for (Entity item : items) {
-            followers.get(item).show();
+            if (followers.get(item) != null)
+                followers.get(item).show();
         }
     }
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBoxMediator.java
index 1130f1b3..2f5b70f1 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UILayerBoxMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UILayerBoxMediator.java
@@ -120,7 +120,7 @@ public class UILayerBoxMediator extends PanelMediator<UILayerBox> {
                 selectEntitiesByLayerName(layerItem);
                 break;
             case UILayerBox.CREATE_NEW_LAYER:
-                Dialogs.showInputDialog(Sandbox.getInstance().getUIStage(), "Please set unique name for your Layer", "Please set unique name for your Layer", new InputDialogListener() {
+                Dialogs.showInputDialog(Sandbox.getInstance().getUIStage(), "New Layer", "Please set unique name for your Layer", false, new InputDialogListener() {
                     @Override
                     public void finished(String input) {
                         if (checkIfNameIsUnique(input)) {
@@ -151,11 +151,11 @@ public class UILayerBoxMediator extends PanelMediator<UILayerBox> {
                     String layerName = layers.get(deletingLayerIndex).layerName;
                     Dialogs.showConfirmDialog(sandbox.getUIStage(),
                             "Delete Layer", "Do you realy want to delete '" + layerName + "' layer?",
-                            new String[]{"Delete", "Cancel"}, new Integer[]{0, 1}, r -> {
-                                if (r == 0) {
+                            new String[]{"Cancel", "Delete"}, new Integer[]{0, 1}, r -> {
+                                if (r == 1) {
                                     facade.sendNotification(MsgAPI.ACTION_DELETE_LAYER, layerName);
                                 }
-                            });
+                            }).padBottom(20).pack();
                 }
                 break;
             case UILayerBox.LOCK_LAYER:
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBoxMediator.java
index 40c2f246..3538efbd 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBoxMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UIResolutionBoxMediator.java
@@ -96,7 +96,7 @@ public class UIResolutionBoxMediator extends SimpleMediator<UIResolutionBox> {
                                 String sceneName = sandbox.sceneControl.getCurrentSceneVO().sceneName;
                                 sandbox.loadCurrentProject(sceneName);
                             }
-                        });
+                        }).padBottom(20).pack();
                 break;
 
             case UIResolutionBox.REPACK_BTN_CLICKED:
diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UISceneBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UISceneBoxMediator.java
index ea3779ed..3527abb0 100644
--- a/src/main/java/games/rednblack/editor/view/ui/box/UISceneBoxMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/box/UISceneBoxMediator.java
@@ -45,7 +45,7 @@ public class UISceneBoxMediator extends SimpleMediator<UISceneBox> {
                 sandbox.loadScene(notification.getBody());
                 break;
             case UISceneBox.CREATE_NEW_SCENE_BTN_CLICKED:
-                Dialogs.showInputDialog(sandbox.getUIStage(), "Create New Scene", "Scene Name : ", new StringNameValidator(), new InputDialogListener() {
+                Dialogs.showInputDialog(sandbox.getUIStage(), "Create New Scene", "Scene Name : ", false, new StringNameValidator(), new InputDialogListener() {
                     @Override
                     public void finished(String input) {
                         if (input == null || input.equals("")) {
@@ -72,7 +72,7 @@ public class UISceneBoxMediator extends SimpleMediator<UISceneBox> {
                                 sceneDataManager.deleteCurrentScene();
                                 sandbox.loadScene("MainScene");
                             }
-                        });
+                        }).padBottom(20).pack();
                 break;
             default:
                 break;
diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/ImportDialogMediator.java b/src/main/java/games/rednblack/editor/view/ui/dialog/ImportDialogMediator.java
index 4b827713..eed39b48 100644
--- a/src/main/java/games/rednblack/editor/view/ui/dialog/ImportDialogMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/dialog/ImportDialogMediator.java
@@ -40,6 +40,7 @@ import games.rednblack.editor.proxy.ProjectManager;
 import games.rednblack.editor.view.menu.HyperLap2DMenuBar;
 import games.rednblack.editor.view.stage.UIStage;
 import games.rednblack.editor.renderer.data.SceneVO;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser;
 import org.apache.commons.lang3.SystemUtils;
 
 import java.awt.datatransfer.DataFlavor;
@@ -151,7 +152,7 @@ public class ImportDialogMediator extends SimpleMediator<ImportDialog> {
 
     private void showFileChoose() {
          Sandbox sandbox = Sandbox.getInstance();
-        FileChooser fileChooser = new FileChooser(FileChooser.Mode.OPEN);
+        FileChooser fileChooser = new HyperLapFileChooser(FileChooser.Mode.OPEN);
 
         fileChooser.setFileTypeFilter(ImportUtils.getInstance().getFileTypeFilter());
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java
index 5acce85b..f2ef0b88 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIBasicItemPropertiesMediator.java
@@ -25,6 +25,7 @@ import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
 import com.badlogic.gdx.utils.reflect.ReflectionException;
 import games.rednblack.editor.renderer.components.light.LightBodyComponent;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker;
 import games.rednblack.h2d.common.MsgAPI;
 import com.kotcrab.vis.ui.widget.color.ColorPicker;
 import com.kotcrab.vis.ui.widget.color.ColorPickerAdapter;
@@ -110,7 +111,7 @@ public class UIBasicItemPropertiesMediator extends UIItemPropertiesMediator<Enti
         switch (notification.getName()) {
             case UIBasicItemProperties.TINT_COLOR_BUTTON_CLICKED:
                 Color prevColor = viewComponent.getTintColor().cpy();
-                ColorPicker picker = new ColorPicker(new ColorPickerAdapter() {
+                ColorPicker picker = new HyperLapColorPicker(new ColorPickerAdapter() {
                     @Override
                     public void finished(Color newColor) {
                         TintComponent tintComponent = observableReference.getComponent(TintComponent.class);
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java
index 0eac4d96..e729826c 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILightBodyPropertiesMediator.java
@@ -12,6 +12,7 @@ import games.rednblack.editor.renderer.components.light.LightBodyComponent;
 import games.rednblack.editor.renderer.data.LightBodyDataVO;
 import games.rednblack.editor.view.stage.Sandbox;
 import games.rednblack.editor.view.ui.properties.UIItemPropertiesMediator;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker;
 import games.rednblack.h2d.common.MsgAPI;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -48,7 +49,7 @@ public class UILightBodyPropertiesMediator extends UIItemPropertiesMediator<Enti
                 break;
             case UILightBodyProperties.LIGHT_COLOR_BUTTON_CLICKED:
                 Color prevColor = viewComponent.getLightColor().cpy();
-                ColorPicker picker = new ColorPicker(new ColorPickerAdapter() {
+                ColorPicker picker = new HyperLapColorPicker(new ColorPickerAdapter() {
                     @Override
                     public void finished(Color newColor) {
                         lightComponent = observableReference.getComponent(LightBodyComponent.class);
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
index 8fabfbdf..4f93b2c6 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UIScenePropertiesMediator.java
@@ -23,6 +23,7 @@ import com.kotcrab.vis.ui.widget.color.ColorPickerAdapter;
 import games.rednblack.editor.proxy.ResolutionManager;
 import games.rednblack.editor.renderer.data.LightsPropertiesVO;
 import games.rednblack.editor.renderer.data.ResolutionEntryVO;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapColorPicker;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 
@@ -61,7 +62,7 @@ public class UIScenePropertiesMediator extends UIAbstractPropertiesMediator<Scen
 
         switch (notification.getName()) {
             case UISceneProperties.AMBIENT_COLOR_BUTTON_CLICKED:
-                ColorPicker picker = new ColorPicker(new ColorPickerAdapter() {
+                ColorPicker picker = new HyperLapColorPicker(new ColorPickerAdapter() {
                     @Override
                     public void finished(Color newColor) {
                         viewComponent.setAmbientColor(newColor);
@@ -82,7 +83,7 @@ public class UIScenePropertiesMediator extends UIAbstractPropertiesMediator<Scen
 
                 break;
             case UISceneProperties.DIRECTIONAL_COLOR_BUTTON_CLICKED:
-                picker = new ColorPicker(new ColorPickerAdapter() {
+                picker = new HyperLapColorPicker(new ColorPickerAdapter() {
                     @Override
                     public void finished(Color newColor) {
                         viewComponent.setDirectionalColor(newColor);
diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java b/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java
index 691f071a..26f86d35 100644
--- a/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java
+++ b/src/main/java/games/rednblack/editor/view/ui/widget/InputFileWidget.java
@@ -30,6 +30,7 @@ import com.kotcrab.vis.ui.widget.VisTextField;
 import com.kotcrab.vis.ui.widget.file.FileChooser;
 import com.kotcrab.vis.ui.widget.file.FileChooserListener;
 import games.rednblack.editor.utils.StandardWidgetsFactory;
+import games.rednblack.editor.view.ui.widget.ui.HyperLapFileChooser;
 
 /**
  * Created by sargis on 4/3/15.
@@ -56,7 +57,7 @@ public class InputFileWidget extends VisTable {
     }
 
     private void initFileChooser(FileChooser.Mode mode, FileChooser.SelectionMode selectionMode, boolean multiselectionEnabled) {
-        fileChooser = new FileChooser(mode);
+        fileChooser = new HyperLapFileChooser(mode);
         fileChooser.setSelectionMode(selectionMode);
         fileChooser.setMultiSelectionEnabled(multiselectionEnabled);
         fileChooser.setListener(new InputFileWidgetFileChooserListener());
diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java b/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java
new file mode 100644
index 00000000..1f69401c
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapColorPicker.java
@@ -0,0 +1,47 @@
+package games.rednblack.editor.view.ui.widget.ui;
+
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.kotcrab.vis.ui.widget.VisImageButton;
+import com.kotcrab.vis.ui.widget.color.ColorPicker;
+import com.kotcrab.vis.ui.widget.color.ColorPickerListener;
+
+public class HyperLapColorPicker extends ColorPicker {
+
+    public HyperLapColorPicker (String title) {
+        this("default", title, null);
+    }
+
+    public HyperLapColorPicker (String title, ColorPickerListener listener) {
+        this("default", title, listener);
+    }
+
+    public HyperLapColorPicker (ColorPickerListener listener) {
+        this("default", null, listener);
+    }
+
+    public HyperLapColorPicker (String styleName, String title, ColorPickerListener listener) {
+        super(styleName, title, listener);
+    }
+
+    @Override
+    public void addCloseButton() {
+        VisImageButton closeButton = new VisImageButton("close-window");
+        this.getTitleTable().add(closeButton).padRight(0);
+        closeButton.addListener(new ChangeListener() {
+            @Override
+            public void changed (ChangeEvent event, Actor actor) {
+                close();
+            }
+        });
+        closeButton.addListener(new ClickListener() {
+            @Override
+            public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
+                event.cancel();
+                return true;
+            }
+        });
+    }
+}
diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java b/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java
new file mode 100644
index 00000000..a6c4844d
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/view/ui/widget/ui/HyperLapFileChooser.java
@@ -0,0 +1,46 @@
+package games.rednblack.editor.view.ui.widget.ui;
+
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.kotcrab.vis.ui.widget.VisImageButton;
+import com.kotcrab.vis.ui.widget.file.FileChooser;
+
+public class HyperLapFileChooser extends FileChooser {
+    public HyperLapFileChooser(Mode mode) {
+        super(mode);
+    }
+
+    public HyperLapFileChooser(FileHandle directory, Mode mode) {
+        super(directory, mode);
+    }
+
+    public HyperLapFileChooser(String title, Mode mode) {
+        super(title, mode);
+    }
+
+    public HyperLapFileChooser(String styleName, String title, Mode mode) {
+        super(styleName, title, mode);
+    }
+
+    @Override
+    public void addCloseButton() {
+        VisImageButton closeButton = new VisImageButton("close-window");
+        this.getTitleTable().add(closeButton).padRight(0);
+        closeButton.addListener(new ChangeListener() {
+            @Override
+            public void changed (ChangeEvent event, Actor actor) {
+                close();
+            }
+        });
+        closeButton.addListener(new ClickListener() {
+            @Override
+            public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
+                event.cancel();
+                return true;
+            }
+        });
+    }
+}