diff --git a/components/rx/Demos/RxViewsPanel/project1.lpi b/components/rx/Demos/RxViewsPanel/project1.lpi
index 6b9514b7c..33339124f 100644
--- a/components/rx/Demos/RxViewsPanel/project1.lpi
+++ b/components/rx/Demos/RxViewsPanel/project1.lpi
@@ -15,6 +15,9 @@
     <VersionInfo>
       <StringTable ProductVersion=""/>
     </VersionInfo>
+    <BuildModes Count="1">
+      <Item1 Name="default" Default="True"/>
+    </BuildModes>
     <PublishOptions>
       <Version Value="2"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
@@ -56,10 +59,11 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="33"/>
-        <CursorPos X="29" Y="58"/>
+        <TopLine Value="16"/>
+        <CursorPos X="7" Y="34"/>
         <UsageCount Value="23"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -69,7 +73,7 @@
         <UnitName Value="RxViewsPanel"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="194"/>
+        <TopLine Value="167"/>
         <CursorPos X="36" Y="201"/>
         <UsageCount Value="11"/>
         <Bookmarks Count="2">
@@ -105,13 +109,10 @@
       <Unit6>
         <Filename Value="/usr/local/share/lazarus/lcl/extctrls.pp"/>
         <UnitName Value="ExtCtrls"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="253"/>
-        <CursorPos X="13" Y="1364"/>
+        <TopLine Value="1147"/>
+        <CursorPos X="13" Y="1179"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="/usr/local/share/lazarus/lcl/buttons.pp"/>
@@ -177,34 +178,34 @@
         <UsageCount Value="10"/>
       </Unit14>
     </Units>
-    <JumpHistory Count="26" HistoryIndex="25">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="11" TopLine="14"/>
+        <Caret Line="18" Column="29" TopLine="1"/>
       </Position1>
       <Position2>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="14" Column="8" TopLine="1"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
+        <Caret Line="121" Column="98" TopLine="99"/>
       </Position2>
       <Position3>
         <Filename Value="unit1.pas"/>
         <Caret Line="18" Column="29" TopLine="1"/>
       </Position3>
       <Position4>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="121" Column="98" TopLine="99"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="40" Column="3" TopLine="15"/>
       </Position4>
       <Position5>
         <Filename Value="unit1.pas"/>
-        <Caret Line="18" Column="29" TopLine="1"/>
+        <Caret Line="41" Column="3" TopLine="15"/>
       </Position5>
       <Position6>
         <Filename Value="unit1.pas"/>
-        <Caret Line="40" Column="3" TopLine="15"/>
+        <Caret Line="42" Column="3" TopLine="15"/>
       </Position6>
       <Position7>
         <Filename Value="unit1.pas"/>
-        <Caret Line="41" Column="3" TopLine="15"/>
+        <Caret Line="43" Column="3" TopLine="15"/>
       </Position7>
       <Position8>
         <Filename Value="unit1.pas"/>
@@ -212,85 +213,101 @@
       </Position8>
       <Position9>
         <Filename Value="unit1.pas"/>
-        <Caret Line="43" Column="3" TopLine="15"/>
+        <Caret Line="36" Column="3" TopLine="7"/>
       </Position9>
       <Position10>
         <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="3" TopLine="15"/>
+        <Caret Line="42" Column="41" TopLine="17"/>
       </Position10>
       <Position11>
         <Filename Value="unit1.pas"/>
-        <Caret Line="36" Column="3" TopLine="7"/>
+        <Caret Line="43" Column="41" TopLine="17"/>
       </Position11>
       <Position12>
         <Filename Value="unit1.pas"/>
-        <Caret Line="42" Column="41" TopLine="17"/>
+        <Caret Line="44" Column="41" TopLine="17"/>
       </Position12>
       <Position13>
         <Filename Value="unit1.pas"/>
-        <Caret Line="43" Column="41" TopLine="17"/>
+        <Caret Line="45" Column="41" TopLine="17"/>
       </Position13>
       <Position14>
         <Filename Value="unit1.pas"/>
-        <Caret Line="44" Column="41" TopLine="17"/>
+        <Caret Line="46" Column="41" TopLine="17"/>
       </Position14>
       <Position15>
         <Filename Value="unit1.pas"/>
-        <Caret Line="45" Column="41" TopLine="17"/>
+        <Caret Line="47" Column="41" TopLine="18"/>
       </Position15>
       <Position16>
         <Filename Value="unit1.pas"/>
-        <Caret Line="46" Column="41" TopLine="17"/>
+        <Caret Line="48" Column="41" TopLine="19"/>
       </Position16>
       <Position17>
         <Filename Value="unit1.pas"/>
-        <Caret Line="47" Column="41" TopLine="18"/>
+        <Caret Line="49" Column="41" TopLine="20"/>
       </Position17>
       <Position18>
         <Filename Value="unit1.pas"/>
-        <Caret Line="48" Column="41" TopLine="19"/>
+        <Caret Line="50" Column="41" TopLine="21"/>
       </Position18>
       <Position19>
         <Filename Value="unit1.pas"/>
-        <Caret Line="49" Column="41" TopLine="20"/>
+        <Caret Line="51" Column="41" TopLine="22"/>
       </Position19>
       <Position20>
         <Filename Value="unit1.pas"/>
-        <Caret Line="50" Column="41" TopLine="21"/>
+        <Caret Line="52" Column="41" TopLine="27"/>
       </Position20>
       <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="51" Column="41" TopLine="22"/>
+        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
+        <Caret Line="156" Column="25" TopLine="151"/>
       </Position21>
       <Position22>
         <Filename Value="unit1.pas"/>
-        <Caret Line="52" Column="41" TopLine="27"/>
+        <Caret Line="58" Column="29" TopLine="33"/>
       </Position22>
       <Position23>
         <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="156" Column="25" TopLine="151"/>
+        <Caret Line="201" Column="36" TopLine="194"/>
       </Position23>
       <Position24>
         <Filename Value="unit1.pas"/>
-        <Caret Line="58" Column="29" TopLine="33"/>
+        <Caret Line="58" Column="29" TopLine="9"/>
       </Position24>
       <Position25>
-        <Filename Value="/usr/local/share/lazarus/components/rxnew/rxviewspanel.pas"/>
-        <Caret Line="201" Column="36" TopLine="194"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="53" Column="3" TopLine="50"/>
       </Position25>
       <Position26>
-        <Filename Value="/usr/local/share/lazarus/lcl/extctrls.pp"/>
-        <Caret Line="1364" Column="13" TopLine="1353"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="54" Column="3" TopLine="51"/>
       </Position26>
+      <Position27>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="55" Column="3" TopLine="13"/>
+      </Position27>
+      <Position28>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="56" Column="3" TopLine="24"/>
+      </Position28>
+      <Position29>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="57" Column="3" TopLine="25"/>
+      </Position29>
+      <Position30>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="33" Column="7" TopLine="16"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <Target>
       <Filename Value="project1"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)/"/>
+      <IncludeFiles Value="$(ProjOutDir)"/>
       <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
diff --git a/components/rx/Demos/RxViewsPanel/unit1.lfm b/components/rx/Demos/RxViewsPanel/unit1.lfm
index 289225c54..2099c0faf 100644
--- a/components/rx/Demos/RxViewsPanel/unit1.lfm
+++ b/components/rx/Demos/RxViewsPanel/unit1.lfm
@@ -1,17 +1,17 @@
 object Form1: TForm1
-  Left = 429
-  Height = 626
-  Top = 142
-  Width = 889
+  Left = 292
+  Height = 667
+  Top = 120
+  Width = 935
   ActiveControl = ToolPanel1
   Caption = 'RxViewsPanel demo'
-  ClientHeight = 626
-  ClientWidth = 889
+  ClientHeight = 667
+  ClientWidth = 935
   OnCreate = FormCreate
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
   object RxViewsPanel1: TRxViewsPanel
     Left = 0
-    Height = 574
+    Height = 617
     Top = 31
     Width = 128
     Align = alLeft
@@ -44,157 +44,109 @@ object Form1: TForm1
     OnSelectViewEvent = RxViewsPanel1SelectViewEvent
     ItemIndex = 0
     BevelOuter = bvLowered
-    ClientHeight = 574
+    ClientHeight = 617
     ClientWidth = 128
     ParentColor = False
     TabOrder = 0
   end
   object Splitter1: TSplitter
     Left = 128
-    Height = 574
+    Height = 617
     Top = 31
     Width = 5
   end
   object ExtendedNotebook1: TExtendedNotebook
     Left = 133
-    Height = 574
+    Height = 617
     Top = 31
-    Width = 756
+    Width = 802
+    ActivePage = TabSheet4
     Align = alClient
-    PageIndex = 2
     ShowTabs = False
+    TabIndex = 3
     TabOrder = 2
-    object Page1: TPage
-      Caption = 'Gant'
-      ClientWidth = 750
-      ClientHeight = 568
-      object StringGrid2: TStringGrid
-        Left = 0
-        Height = 620
-        Top = 0
-        Width = 328
-        Align = alLeft
-        TabOrder = 0
-      end
-      object PaintBox1: TPaintBox
-        Left = 333
-        Height = 620
-        Top = 0
-        Width = 417
-        Align = alClient
-      end
-      object Splitter2: TSplitter
-        Left = 328
-        Height = 620
-        Top = 0
-        Width = 5
-      end
-    end
-    object Page2: TPage
-      Caption = 'Tasks'
-      ClientWidth = 750
-      ClientHeight = 568
+    object TabSheet1: TTabSheet
+      Caption = 'TabSheet1'
+      ClientHeight = 611
+      ClientWidth = 796
       object StringGrid1: TStringGrid
-        Left = 0
-        Height = 620
-        Top = 0
-        Width = 750
-        Align = alClient
+        Left = 19
+        Height = 302
+        Top = 13
+        Width = 510
         TabOrder = 0
       end
     end
-    object Page3: TPage
-      Caption = 'Resourses'
-      ClientWidth = 750
-      ClientHeight = 568
+    object TabSheet2: TTabSheet
+      Caption = 'TabSheet2'
+      ClientHeight = 611
+      ClientWidth = 796
+      object StringGrid2: TStringGrid
+        Left = 151
+        Height = 341
+        Top = 10
+        Width = 509
+        TabOrder = 0
+      end
+    end
+    object TabSheet3: TTabSheet
+      Caption = 'TabSheet3'
+      ClientHeight = 611
+      ClientWidth = 796
       object StringGrid3: TStringGrid
-        Left = 0
-        Height = 568
-        Top = 0
-        Width = 750
-        Align = alClient
-        AutoFillColumns = True
-        ColCount = 7
-        Columns = <        
-          item
-            Title.Caption = 'Resourse name'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'Short name'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'Type'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'Group'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'email'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'Cost'
-            Width = 106
-          end        
-          item
-            Title.Caption = 'Desc'
-            Width = 112
-          end>
-        FixedCols = 0
+        Left = 109
+        Height = 325
+        Top = 146
+        Width = 607
         TabOrder = 0
-        ColWidths = (
-          106
-          106
-          106
-          106
-          106
-          106
-          112
-        )
       end
     end
-    object Page4: TPage
-      Caption = 'Use resourses'
-      ClientWidth = 750
-      ClientHeight = 568
+    object TabSheet4: TTabSheet
+      Caption = 'TabSheet4'
+      ClientHeight = 611
+      ClientWidth = 796
       object StringGrid4: TStringGrid
         Left = 0
-        Height = 568
+        Height = 177
         Top = 0
-        Width = 750
-        Align = alClient
-        AutoFillColumns = True
-        ColCount = 6
-        FixedCols = 0
-        RowCount = 1
+        Width = 796
+        Align = alTop
         TabOrder = 0
-        ColWidths = (
-          125
-          125
-          125
-          125
-          125
-          125
+      end
+      object Splitter2: TSplitter
+        Cursor = crVSplit
+        Left = 0
+        Height = 5
+        Top = 177
+        Width = 796
+        Align = alTop
+        ResizeAnchor = akTop
+      end
+      object Memo1: TMemo
+        Left = 0
+        Height = 429
+        Top = 182
+        Width = 796
+        Align = alClient
+        Lines.Strings = (
+          'Memo1'
         )
+        TabOrder = 2
       end
     end
   end
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 21
-    Top = 605
-    Width = 889
+    Height = 19
+    Top = 648
+    Width = 935
     Panels = <>
   end
   object ToolPanel1: TToolPanel
     Left = 0
     Height = 31
     Top = 0
-    Width = 889
+    Width = 935
     Items = <>
     Options = []
     Align = alTop
diff --git a/components/rx/Demos/RxViewsPanel/unit1.pas b/components/rx/Demos/RxViewsPanel/unit1.pas
index 98832010e..dc35ee4e6 100644
--- a/components/rx/Demos/RxViewsPanel/unit1.pas
+++ b/components/rx/Demos/RxViewsPanel/unit1.pas
@@ -15,6 +15,7 @@ type
   TForm1 = class(TForm)
     ExtendedNotebook1: TExtendedNotebook;
     ImageList2: TImageList;
+    Memo1: TMemo;
     Page1: TPage;
     Page2: TPage;
     Page3: TPage;
@@ -28,6 +29,10 @@ type
     StringGrid2: TStringGrid;
     StringGrid3: TStringGrid;
     StringGrid4: TStringGrid;
+    TabSheet1: TTabSheet;
+    TabSheet2: TTabSheet;
+    TabSheet3: TTabSheet;
+    TabSheet4: TTabSheet;
     ToolPanel1: TToolPanel;
     procedure FormCreate(Sender: TObject);
     procedure RxViewsPanel1SelectViewEvent(ItemIndex: integer;