diff --git a/src/dlangui/dialogs/settingsdialog.d b/src/dlangui/dialogs/settingsdialog.d
index 1df5e723..b30baccd 100644
--- a/src/dlangui/dialogs/settingsdialog.d
+++ b/src/dlangui/dialogs/settingsdialog.d
@@ -191,8 +191,8 @@ class SettingsDialog : Dialog {
         _tree.selectionListener = &onTreeItemSelected;
 		_tree.fontSize = 16;
         _frame = new FrameLayout("prop_pages");
-        _frame.minHeight(200).minWidth(100).layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT);
         _frame.styleId = STYLE_SETTINGS_PAGES;
+        _frame.minHeight(200).minWidth(100).layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT);
         createControls(_layout, _tree.items);
         HorizontalLayout content = new HorizontalLayout("settings_dlg_content");
         content.addChild(_tree);
@@ -202,6 +202,7 @@ class SettingsDialog : Dialog {
 		addChild(createButtonsPanel([ACTION_APPLY, ACTION_CANCEL], 0, 0));
         if (_layout.childCount > 0)
             _tree.selectItem(_layout.child(0).id);
+
     }
 
 }
diff --git a/src/dlangui/widgets/scroll.d b/src/dlangui/widgets/scroll.d
index 4f2f3439..c16d167c 100644
--- a/src/dlangui/widgets/scroll.d
+++ b/src/dlangui/widgets/scroll.d
@@ -375,7 +375,7 @@ class ScrollWidget :  ScrollWidgetBase {
         if (_contentWidget) {
             Point sz = fullContentSize();
             Point p = scrollPos;
-            _contentWidget.layout(Rect(_pos.left - p.x, _pos.top - p.y, _pos.left + sz.x - p.x, _pos.top + sz.y - p.y));
+            _contentWidget.layout(Rect(_clientRect.left - p.x, _clientRect.top - p.y, _clientRect.left + sz.x - p.x, _clientRect.top + sz.y - p.y));
             _contentWidget.onDraw(buf);
         }
     }
diff --git a/views/res/theme_default.xml b/views/res/theme_default.xml
index 6d4d9db1..012d5d01 100644
--- a/views/res/theme_default.xml
+++ b/views/res/theme_default.xml
@@ -362,21 +362,25 @@
     />
 
     <style id="SETTINGS_TREE"
-        margins="8,8,8,8"
+        margins="4,4,4,4"
         padding="4,4,4,4"
         backgroundColor="#FFFFFF"
+        layoutWeight="3"
     />
 
     <style id="SETTINGS_PAGES"
-        margins="0,8,8,8"
+        margins="0,4,4,4"
         padding="4,4,4,4"
         backgroundColor="#80FFFFFF"
+        layoutWidth="FILL_PARENT"
+        layoutWeight="5"
     />
 
     <style id="SETTINGS_PAGE_TITLE"
         margins="4,4,4,14"
 	fontSize="18"
 	layoutWeight="0"
+        layoutWidth="FILL_PARENT"
     />
 
     <style id="RESIZER_VERTICAL"