diff --git a/src/client/haxe/ru/m/tankz/view/GameFrame.yaml b/src/client/haxe/ru/m/tankz/view/GameFrame.yaml
index 12130df..57d1f75 100644
--- a/src/client/haxe/ru/m/tankz/view/GameFrame.yaml
+++ b/src/client/haxe/ru/m/tankz/view/GameFrame.yaml
@@ -5,7 +5,8 @@ layout:
 views:
   - $type: haxework.view.group.VGroupView
     style: container
-    layout.overflow: true
+    overflow.x: crop
+    overflow.y: crop
     views:
       - id: game
         $type: ru.m.tankz.view.game.GameView
diff --git a/src/client/haxe/ru/m/tankz/view/LevelFrame.yaml b/src/client/haxe/ru/m/tankz/view/LevelFrame.yaml
index bf0c90d..5925984 100644
--- a/src/client/haxe/ru/m/tankz/view/LevelFrame.yaml
+++ b/src/client/haxe/ru/m/tankz/view/LevelFrame.yaml
@@ -1,22 +1,21 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
-    style: container
-    geometry.padding: 20
-    views:
-      - id: header
-        $type: haxework.view.form.LabelView
-        style: text.header
-      - $type: haxework.view.ScrollView
-        geometry.stretch: true
-        view:
-          id: levels
-          $type: haxework.view.data.DataView
-          geometry.width: 100%
-          layout:
-            $type: haxework.view.layout.TailLayout
-            rowSize: 10
-            margin: 5
-          factory: ~levelViewFactory
-          +onItemSelect: ~onLevelSelect
-          geometry.padding: 10
+    -   $type: haxework.view.group.VGroupView
+        style: container
+        geometry.padding: 20
+        views:
+            -   id: header
+                $type: haxework.view.form.LabelView
+                style: text.header
+            -   id: levels
+                $type: haxework.view.data.DataView
+                geometry.width: 100%
+                geometry.height: 100%
+                overflow.y: scroll
+                layout:
+                    $type: haxework.view.layout.TailLayout
+                    rowSize: 10
+                    margin: 5
+                factory: ~levelViewFactory
+                +onItemSelect: ~onLevelSelect
+                geometry.padding: 10
diff --git a/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml b/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml
index c873e92..cedc1b1 100644
--- a/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml
+++ b/src/client/haxe/ru/m/tankz/view/SettingsFrame.yaml
@@ -1,26 +1,24 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
-    style: container
-    geometry.padding: 20
-    views:
-      - $type: haxework.view.form.LabelView
-        style: text.header
-        text: Settings
-      - $type: haxework.view.ScrollView
-        geometry.stretch: true
-        view:
-          $type: haxework.view.group.GroupView
-          geometry.stretch: true
-          layout:
-            $type: haxework.view.layout.TailLayout
-            vAlign: top
-            margin: 20
-            overflow: true
-          views:
-            - id: settings0
-              $type: ru.m.tankz.view.settings.SettingsEditor
-              controlIndex: 0
-            - id: settings1
-              $type: ru.m.tankz.view.settings.SettingsEditor
-              controlIndex: 1
+    -   $type: haxework.view.group.VGroupView
+        style: container
+        geometry.padding: 20
+        views:
+            -   $type: haxework.view.form.LabelView
+                style: text.header
+                text: Settings
+            -   $type: haxework.view.group.GroupView
+                geometry.width: 100%
+                geometry.height: 100%
+                overflow.y: scroll
+                layout:
+                    $type: haxework.view.layout.TailLayout
+                    vAlign: top
+                    margin: 20
+                views:
+                    -   id: settings0
+                        $type: ru.m.tankz.view.settings.SettingsEditor
+                        controlIndex: 0
+                    -   id: settings1
+                        $type: ru.m.tankz.view.settings.SettingsEditor
+                        controlIndex: 1
diff --git a/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml b/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
index 870370e..8d0dae7 100644
--- a/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
+++ b/src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.yaml
@@ -2,71 +2,70 @@
 layout.hAlign: center
 layout.vAlign: middle
 view:
-  $type: haxework.view.group.VGroupView
-  layout.hAlign: center
-  geometry.stretch: true
-  geometry.margin: 10
-  style: window
-  views:
-    - $type: haxework.view.group.HGroupView
-      geometry.width: 100%
-      geometry.padding: 10
-      layout.vAlign: middle
-      views:
-        - id: name
-          $type: haxework.view.form.LabelView
-          geometry.width: 100%
-          geometry.margin.left: 10
-          layout.hAlign: left
-          style: text
-          text: New game
-        - $type: haxework.view.form.ButtonView
-          style: window.close
-          +onPress: ~reject('close')
-    - $type: haxework.view.group.VGroupView
-      geometry.stretch: true
-      geometry.padding: [5, 20]
-      layout.margin: 5
-      layout.hAlign: center
-      views:
-          - $type: haxework.view.form.LabelView
+    $type: haxework.view.group.VGroupView
+    layout.hAlign: center
+    geometry.stretch: true
+    geometry.margin: 10
+    style: window
+    views:
+        -   $type: haxework.view.group.HGroupView
             geometry.width: 100%
-            style: text
-            text: Type
-          - id: type
-            $type: haxework.view.data.DataView
-            geometry.width: 100%
-            layout:
-              $type: haxework.view.layout.TailLayout
-              margin: 10
-            factory: ~gameTypeViewFactory
-            +onItemSelect: ~onGameTypeSelect
-            data:
-              - "classic"
-              - "dota"
-              - "death"
-          - $type: haxework.view.form.LabelView
-            geometry.width: 100%
-            style: text
-            text: Level
-          - $type: haxework.view.ScrollView
+            geometry.padding: 10
+            layout.vAlign: middle
+            views:
+                -   id: name
+                    $type: haxework.view.form.LabelView
+                    geometry.width: 100%
+                    geometry.margin.left: 10
+                    layout.hAlign: left
+                    style: text
+                    text: New game
+                -   $type: haxework.view.form.ButtonView
+                    style: window.close
+                    +onPress: ~reject('close')
+        -   $type: haxework.view.group.VGroupView
             geometry.stretch: true
-            view:
-                id: level
-                $type: haxework.view.data.DataView
-                geometry.width: 100%
-                layout:
-                  $type: haxework.view.layout.TailLayout
-                  rowSize: 10
-                  margin: 5
-                factory: ~levelViewFactory
-                +onItemSelect: ~onLevelSelect
-                geometry.padding: 10
-    - $type: haxework.view.group.HGroupView
-      layout.hAlign: center
-      layout.margin: 5
-      style: panel
-      views:
-        - $type: haxework.view.form.ButtonView
-          text: Create
-          +onPress: ~submit()
+            geometry.padding: [5, 20]
+            layout.margin: 5
+            layout.hAlign: center
+            views:
+                -   $type: haxework.view.form.LabelView
+                    geometry.width: 100%
+                    style: text
+                    text: Type
+                -   id: type
+                    $type: haxework.view.data.DataView
+                    geometry.width: 100%
+                    layout:
+                        $type: haxework.view.layout.TailLayout
+                        margin: 10
+                    factory: ~gameTypeViewFactory
+                    +onItemSelect: ~onGameTypeSelect
+                    data:
+                        - "classic"
+                        - "dota"
+                        - "death"
+                -   $type: haxework.view.form.LabelView
+                    geometry.width: 100%
+                    style: text
+                    text: Level
+                -   id: level
+                    $type: haxework.view.data.DataView
+                    geometry.width: 100%
+                    geometry.height: 100%
+                    overflow.y: scroll
+                    layout:
+                        $type: haxework.view.layout.TailLayout
+                        rowSize: 10
+                        margin: 5
+                    factory: ~levelViewFactory
+                    +onItemSelect: ~onLevelSelect
+                    geometry.padding: 10
+        -   $type: haxework.view.group.HGroupView
+            layout.hAlign: center
+            layout.margin: 5
+            style: panel
+            views:
+                -   $type: haxework.view.form.ButtonView
+                    text: Create
+                    +onPress: ~submit()
diff --git a/src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml b/src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml
index a6eb24c..7e95111 100644
--- a/src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml
+++ b/src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml
@@ -2,49 +2,47 @@
 layout.hAlign: center
 layout.vAlign: middle
 view:
-  $type: haxework.view.group.VGroupView
-  layout.hAlign: center
-  geometry.width: 100%
-  geometry.height: 100%
-  # geometry.width: 400
-  # geometry.height: 400
-  geometry.margin: 10
-  style: window
-  views:
-    - $type: haxework.view.group.HGroupView
-      geometry.width: 100%
-      geometry.padding: 10
-      layout.vAlign: middle
-      views:
-        - id: name
-          $type: haxework.view.form.LabelView
-          geometry.width: 100%
-          geometry.margin.left: 10
-          layout.hAlign: left
-          style: text
-        - $type: haxework.view.form.ButtonView
-          style: window.close
-          +onPress: ~reject('close')
-    - $type: haxework.view.ScrollView
-      geometry.stretch: true
-      layout.hAlign: center
-      view:
-        id: slots
-        $type: haxework.view.data.DataView
-        geometry.padding: 10
-        geometry.width: 100%
-        layout.hAlign: center
-        factory: ~slotViewFactory
-        layout:
-          $type: haxework.view.layout.VerticalLayout
-          # $type: haxework.view.layout.TailLayout
-          margin: 5
-    - id: presets
-      $type: haxework.view.data.DataView
-      factory: ~presetViewFactory
-      +onDataSelect: ~onPresetSelect
-      layout:
-        $type: haxework.view.layout.HorizontalLayout
-        hAlign: center
-        margin: 5
-      style: panel
+    $type: haxework.view.group.VGroupView
+    layout.hAlign: center
+    geometry.width: 100%
+    geometry.height: 100%
+    # geometry.width: 400
+    # geometry.height: 400
+    geometry.margin: 10
+    style: window
+    views:
+        -   $type: haxework.view.group.HGroupView
+            geometry.width: 100%
+            geometry.padding: 10
+            layout.vAlign: middle
+            views:
+                -   id: name
+                    $type: haxework.view.form.LabelView
+                    geometry.width: 100%
+                    geometry.margin.left: 10
+                    layout.hAlign: left
+                    style: text
+                -   $type: haxework.view.form.ButtonView
+                    style: window.close
+                    +onPress: ~reject('close')
+        -   id: slots
+            $type: haxework.view.data.DataView
+            geometry.padding: 10
+            geometry.width: 100%
+            geometry.height: 100%
+            layout.hAlign: center
+            overflow.y: scroll
+            factory: ~slotViewFactory
+            layout:
+                $type: haxework.view.layout.VerticalLayout
+                # $type: haxework.view.layout.TailLayout
+                margin: 5
+        -   id: presets
+            $type: haxework.view.data.DataView
+            factory: ~presetViewFactory
+            +onDataSelect: ~onPresetSelect
+            layout:
+                $type: haxework.view.layout.HorizontalLayout
+                hAlign: center
+                margin: 5
+            style: panel