diff --git a/EDMI_ClientSuite/Base/BaseForm.resx b/EDMI_ClientSuite/Base/BaseForm.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/EDMI_ClientSuite/Base/BaseForm.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/EDMI_ClientSuite/Base/BaseForm.vb b/EDMI_ClientSuite/Base/BaseForm.vb
index d647492e..8bde5fd9 100644
--- a/EDMI_ClientSuite/Base/BaseForm.vb
+++ b/EDMI_ClientSuite/Base/BaseForm.vb
@@ -1,43 +1,60 @@
 Imports DevExpress.XtraBars.Ribbon
 Imports DigitalData.Modules.Logging
 
-''' <summary>
-''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
-''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form, eg.:
-''' 
-''' Partial Class frmExample
-'''     Inherits BaseForm
-'''     
-'''     ... 
-''' End Class
-''' </summary>
-Public Class BaseForm
-    Inherits Form
+Namespace Base
+    ''' <summary>
+    ''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
+    ''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form, eg.:
+    ''' 
+    ''' Partial Class frmExample
+    '''     Inherits BaseForm
+    '''     
+    '''     ... 
+    ''' End Class
+    ''' </summary>
+    Public Class BaseForm
+        Inherits Form
 
-    Private ReadOnly _Logger As Logger
-    Private ReadOnly _ErrorHandler As ClassErrorHandler
+        Private ReadOnly _Logger As Logger
+        Private ReadOnly _ErrorHandler As ClassErrorHandler
 
-    Protected ReadOnly Property Logger As Logger
-        Get
-            Return _Logger
-        End Get
-    End Property
+        Protected ReadOnly Property Logger As Logger
+            Get
+                Return _Logger
+            End Get
+        End Property
 
-    Public Sub New()
-        ' Get the full name of the inheriting form
-        ' so the log messages have the right classname
-        Dim oClassName = [GetType]().FullName
+        Public Sub New()
+            ' Get the full name of the inheriting form
+            ' so the log messages have the right classname
+            Dim oClassName = [GetType]().FullName
 
-        ' My.LogConfig is undefined in the designer  
-        _Logger = My.LogConfig?.GetLogger(oClassName)
-        _ErrorHandler = New ClassErrorHandler(_Logger)
+            ' My.LogConfig is undefined in the designer  
+            _Logger = My.LogConfig?.GetLogger(oClassName)
+            _ErrorHandler = New ClassErrorHandler(_Logger)
 
-        ' When you add something, be careful if it 
-        ' depends on a global var like My.LogConfig
-        ' you might need to check for its existence with ?
-    End Sub
+            ' When you add something, be careful if it 
+            ' depends on a global var like My.LogConfig
+            ' you might need to check for its existence with ?
+        End Sub
 
-    Public Sub ShowErrorMessage(Exception As Exception)
-        _ErrorHandler.ShowErrorMessage(Exception)
-    End Sub
-End Class
\ No newline at end of file
+        Public Sub ShowErrorMessage(Exception As Exception)
+            _ErrorHandler.ShowErrorMessage(Exception)
+        End Sub
+
+        Private Sub InitializeComponent()
+            Me.SuspendLayout()
+            '
+            'BaseForm
+            '
+            Me.ClientSize = New System.Drawing.Size(284, 261)
+            Me.Name = "BaseForm"
+            Me.ResumeLayout(False)
+
+        End Sub
+
+        Private Sub BaseForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+        End Sub
+    End Class
+End Namespace
diff --git a/EDMI_ClientSuite/Base/BaseRibbonForm.vb b/EDMI_ClientSuite/Base/BaseRibbonForm.vb
index 8190b869..20a32fa4 100644
--- a/EDMI_ClientSuite/Base/BaseRibbonForm.vb
+++ b/EDMI_ClientSuite/Base/BaseRibbonForm.vb
@@ -2,63 +2,93 @@
 Imports DevExpress.XtraBars.Ribbon
 Imports DigitalData.Modules.Logging
 
-''' <summary>
-''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
-''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form, eg.:
-''' 
-''' Partial Class frmExample
-'''     Inherits BaseRibbonForm
-'''     
-'''     ... 
-''' End Class
-''' 
-''' Only BaseRibbonForms can have panels attached to it!
-''' </summary>
-Public Class BaseRibbonForm
-    Inherits RibbonForm
-
-    Private ReadOnly _Logger As Logger
-    Private ReadOnly _ErrorHandler As ClassErrorHandler
-
-    Protected ReadOnly Property Logger As Logger
-        Get
-            Return _Logger
-        End Get
-    End Property
-
-    Public Sub New()
-        ' Get the full name of the inheriting form
-        ' so the log messages have the right classname
-        Dim oClassName = [GetType]().FullName
-
-        ' My.LogConfig is undefined in the designer  
-        _Logger = My.LogConfig?.GetLogger(oClassName)
-        _ErrorHandler = New ClassErrorHandler(_Logger)
-
-        ' When you add something, be careful if it 
-        ' depends on a global var like My.LogConfig
-        ' you might need to check for its existence with ?
-    End Sub
-
-    Public Sub ShowErrorMessage(Exception As Exception)
-        _ErrorHandler.ShowErrorMessage(Exception)
-    End Sub
-
-    Public Sub ShowErrorMessage(ErrorMessage As String)
-        _ErrorHandler.ShowErrorMessage(New Exception(ErrorMessage))
-    End Sub
-
+Namespace Base
     ''' <summary>
-    ''' Returns a list of panels that will be show when the form is opened.
-    ''' This can be overridden by all inheriting forms to extend the list of panels
-    ''' Panels will be created by PanelManager.
+    ''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
+    ''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form, eg.:
+    ''' 
+    ''' Partial Class frmExample
+    '''     Inherits BaseRibbonForm
+    '''     
+    '''     ... 
+    ''' End Class
+    ''' 
+    ''' Only BaseRibbonForms can have panels attached to it!
     ''' </summary>
-    ''' <seealso cref="ClassPanelManager"/>
-    ''' <returns>A list of PanelInformation</returns>
-    Public Overridable Function GetInitialPanels() As List(Of PanelInfo)
-        Return New List(Of PanelInfo)
-    End Function
-End Class
+    Public Class BaseRibbonForm
+        Inherits RibbonForm
+
+        Private ReadOnly _Logger As Logger
+        Private ReadOnly _ErrorHandler As ClassErrorHandler
+
+        Protected ReadOnly Property Logger As Logger
+            Get
+                Return _Logger
+            End Get
+        End Property
+
+        ''' <summary>
+        ''' Sets or gets the ribbon Page that will be shown when the window is visible
+        ''' </summary>
+        ''' <returns></returns>
+        Public Property DefaultRibbonPage As RibbonPage
+
+        Protected Overrides Sub OnLoad(e As EventArgs)
+            MyBase.OnLoad(e)
+
+            If DefaultRibbonPage IsNot Nothing Then
+                Ribbon.SelectPage(DefaultRibbonPage)
+            End If
+        End Sub
+
+        Protected Overrides Sub OnVisibleChanged(e As EventArgs)
+            MyBase.OnVisibleChanged(e)
+
+            If Visible And DefaultRibbonPage IsNot Nothing Then
+                Ribbon.SelectPage(DefaultRibbonPage)
+            End If
+        End Sub
+
+        Protected Overrides Sub OnActivated(e As EventArgs)
+            MyBase.OnVisibleChanged(e)
+
+            If Visible And DefaultRibbonPage IsNot Nothing Then
+                Ribbon.SelectPage(DefaultRibbonPage)
+            End If
+        End Sub
 
 
+        Public Sub New()
+            ' Get the full name of the inheriting form
+            ' so the log messages have the right classname
+            Dim oClassName = [GetType]().FullName
 
+            ' My.LogConfig is undefined in the designer  
+            _Logger = My.LogConfig?.GetLogger(oClassName)
+            _ErrorHandler = New ClassErrorHandler(_Logger)
+
+            ' When you add something, be careful if it 
+            ' depends on a global var like My.LogConfig
+            ' you might need to check for its existence with ?
+        End Sub
+
+        Public Sub ShowErrorMessage(Exception As Exception)
+            _ErrorHandler.ShowErrorMessage(Exception)
+        End Sub
+
+        Public Sub ShowErrorMessage(ErrorMessage As String)
+            _ErrorHandler.ShowErrorMessage(New Exception(ErrorMessage))
+        End Sub
+
+        ''' <summary>
+        ''' Returns a list of panels that will be show when the form is opened.
+        ''' This can be overridden by all inheriting forms to extend the list of panels
+        ''' Panels will be created by PanelManager.
+        ''' </summary>
+        ''' <seealso cref="ClassPanelManager"/>
+        ''' <returns>A list of PanelInformation</returns>
+        Public Overridable Function GetInitialPanels() As List(Of PanelInfo)
+            Return New List(Of PanelInfo)
+        End Function
+    End Class
+End Namespace
diff --git a/EDMI_ClientSuite/ClassPanelManager.vb b/EDMI_ClientSuite/ClassPanelManager.vb
index 5f5f45fa..30a753a8 100644
--- a/EDMI_ClientSuite/ClassPanelManager.vb
+++ b/EDMI_ClientSuite/ClassPanelManager.vb
@@ -3,6 +3,7 @@ Imports DevExpress.XtraBars.Docking2010
 Imports DevExpress.XtraBars.Docking2010.Views
 Imports DevExpress.XtraBars.Docking2010.Views.Tabbed
 Imports DevExpress.XtraGrid
+Imports DigitalData.GUIs.ClientSuite.Base
 Imports DigitalData.Modules.Logging
 
 Public Class ClassPanelManager
diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj
index 07362b61..0009c873 100644
--- a/EDMI_ClientSuite/ClientSuite.vbproj
+++ b/EDMI_ClientSuite/ClientSuite.vbproj
@@ -159,6 +159,10 @@
     <Compile Include="FormDesigner\Controls\Editors\frmDatasourceEditor.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="FormDesigner\Controls\Properties\DatepickerProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\MemoeditProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\CheckboxProperties.vb" />
+    <Compile Include="FormDesigner\Controls\Properties\TextboxProperties.vb" />
     <Compile Include="FormDesigner\frmFormDesigner.Designer.vb">
       <DependentUpon>frmFormDesigner.vb</DependentUpon>
     </Compile>
@@ -314,6 +318,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Base\BaseForm.resx">
+      <DependentUpon>BaseForm.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FormDesigner\Controls\Editors\frmDatasourceEditor.resx">
       <DependentUpon>frmDatasourceEditor.vb</DependentUpon>
     </EmbeddedResource>
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Loader.vb b/EDMI_ClientSuite/FormDesigner/Controls/Loader.vb
index 6c0e7fed..85e2309b 100644
--- a/EDMI_ClientSuite/FormDesigner/Controls/Loader.vb
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Loader.vb
@@ -58,9 +58,10 @@ Namespace Controls
                 End If
 
                 oEditor.Tag = New Metadata() With {
-                .Id = oControlId,
-                .Type = oControlType
-            }
+                    .Id = oControlId,
+                    .Type = oControlType,
+                    .Caption = oCaption
+                }
 
                 LayoutControls.Add(oEditor)
                 LayoutControlGroup.AddItem(oCaption, oEditor)
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Metadata.vb b/EDMI_ClientSuite/FormDesigner/Controls/Metadata.vb
index bf6c5901..ee1ced53 100644
--- a/EDMI_ClientSuite/FormDesigner/Controls/Metadata.vb
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Metadata.vb
@@ -2,6 +2,7 @@
     Public Class Metadata
         Public Id As Int64
         Public Type As String
+        Public Caption As String
     End Class
 End Namespace
 
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Properties/BaseProperties.vb b/EDMI_ClientSuite/FormDesigner/Controls/Properties/BaseProperties.vb
index 71d730a4..d8086c57 100644
--- a/EDMI_ClientSuite/FormDesigner/Controls/Properties/BaseProperties.vb
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Properties/BaseProperties.vb
@@ -9,7 +9,7 @@ Namespace Controls.Properties
         <[ReadOnly](True)>
         Public Property Id As Integer
 
-        <LocalizedCategory("category_view")>
+        <LocalizedCategory("category_info")>
         <LocalizedDescription("desc_name")>
         Public Property Name As String
     End Class
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Properties/CheckboxProperties.vb b/EDMI_ClientSuite/FormDesigner/Controls/Properties/CheckboxProperties.vb
new file mode 100644
index 00000000..c2512d04
--- /dev/null
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Properties/CheckboxProperties.vb
@@ -0,0 +1,7 @@
+Namespace Controls.Properties
+    Public Class CheckboxProperties
+        Inherits BaseProperties
+    End Class
+End Namespace
+
+
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Properties/DatepickerProperties.vb b/EDMI_ClientSuite/FormDesigner/Controls/Properties/DatepickerProperties.vb
new file mode 100644
index 00000000..4b3213ad
--- /dev/null
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Properties/DatepickerProperties.vb
@@ -0,0 +1,6 @@
+Namespace Controls.Properties
+    Public Class DatepickerProperties
+        Inherits BaseProperties
+    End Class
+
+End Namespace
\ No newline at end of file
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Properties/MemoeditProperties.vb b/EDMI_ClientSuite/FormDesigner/Controls/Properties/MemoeditProperties.vb
new file mode 100644
index 00000000..14c155d6
--- /dev/null
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Properties/MemoeditProperties.vb
@@ -0,0 +1,7 @@
+Namespace Controls.Properties
+    Public Class MemoeditProperties
+        Inherits BaseProperties
+    End Class
+End Namespace
+
+
diff --git a/EDMI_ClientSuite/FormDesigner/Controls/Properties/TextboxProperties.vb b/EDMI_ClientSuite/FormDesigner/Controls/Properties/TextboxProperties.vb
new file mode 100644
index 00000000..0dd09224
--- /dev/null
+++ b/EDMI_ClientSuite/FormDesigner/Controls/Properties/TextboxProperties.vb
@@ -0,0 +1,7 @@
+Namespace Controls.Properties
+    Public Class TextboxProperties
+        Inherits BaseProperties
+    End Class
+End Namespace
+
+
diff --git a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.Designer.vb b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.Designer.vb
index 5112d926..7eb54990 100644
--- a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.Designer.vb
+++ b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmFormDesigner
     Inherits BaseRibbonForm
 
@@ -21,10 +23,11 @@ Partial Class frmFormDesigner
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormDesigner))
-        Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.FormDesignerRibbon = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.BarCheckEditLayout = New DevExpress.XtraBars.BarCheckItem()
+        Me.BarCheckEditControls = New DevExpress.XtraBars.BarCheckItem()
         Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
-        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageFormDesigner = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.LayoutControlMain = New DevExpress.XtraLayout.LayoutControl()
@@ -37,16 +40,16 @@ Partial Class frmFormDesigner
         Me.ToolboxItemCombobox = New DevExpress.XtraToolbox.ToolboxItem()
         Me.ToolboxItemCheckbox = New DevExpress.XtraToolbox.ToolboxItem()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
+        Me.XtraTabControlMain = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPageControls = New DevExpress.XtraTab.XtraTabPage()
         Me.XtraTabPageProperties = New DevExpress.XtraTab.XtraTabPage()
         Me.PropertyGridControlMain = New DevExpress.XtraVerticalGrid.PropertyGridControl()
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
-        CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.FormDesignerRibbon, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabControl1.SuspendLayout()
+        CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabControlMain.SuspendLayout()
         Me.XtraTabPageControls.SuspendLayout()
         Me.XtraTabPageProperties.SuspendLayout()
         CType(Me.PropertyGridControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -54,39 +57,56 @@ Partial Class frmFormDesigner
         Me.SplitContainerMain.SuspendLayout()
         Me.SuspendLayout()
         '
-        'RibbonControl
+        'FormDesignerRibbon
         '
-        Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarCheckEditLayout})
-        Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 4
-        Me.RibbonControl.Name = "RibbonControl"
-        Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
-        Me.RibbonControl.Size = New System.Drawing.Size(870, 146)
-        Me.RibbonControl.StatusBar = Me.RibbonStatusBar
+        Me.FormDesignerRibbon.ExpandCollapseItem.Id = 0
+        Me.FormDesignerRibbon.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.FormDesignerRibbon.ExpandCollapseItem, Me.BarCheckEditLayout, Me.BarCheckEditControls})
+        Me.FormDesignerRibbon.Location = New System.Drawing.Point(0, 0)
+        Me.FormDesignerRibbon.MaxItemId = 6
+        Me.FormDesignerRibbon.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always
+        Me.FormDesignerRibbon.Name = "FormDesignerRibbon"
+        Me.FormDesignerRibbon.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
+        Me.FormDesignerRibbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.FormDesignerRibbon.Size = New System.Drawing.Size(870, 146)
+        Me.FormDesignerRibbon.StatusBar = Me.RibbonStatusBar
         '
         'BarCheckEditLayout
         '
         Me.BarCheckEditLayout.Caption = "Layout bearbeiten"
+        Me.BarCheckEditLayout.CheckStyle = DevExpress.XtraBars.BarCheckStyles.Radio
+        Me.BarCheckEditLayout.GroupIndex = 1
         Me.BarCheckEditLayout.Id = 3
         Me.BarCheckEditLayout.ImageOptions.Image = CType(resources.GetObject("BarCheckEditLayout.ImageOptions.Image"), System.Drawing.Image)
         Me.BarCheckEditLayout.ImageOptions.LargeImage = CType(resources.GetObject("BarCheckEditLayout.ImageOptions.LargeImage"), System.Drawing.Image)
         Me.BarCheckEditLayout.Name = "BarCheckEditLayout"
         '
+        'BarCheckEditControls
+        '
+        Me.BarCheckEditControls.BindableChecked = True
+        Me.BarCheckEditControls.Caption = "Elemente bearbeiten"
+        Me.BarCheckEditControls.Checked = True
+        Me.BarCheckEditControls.CheckStyle = DevExpress.XtraBars.BarCheckStyles.Radio
+        Me.BarCheckEditControls.GroupIndex = 1
+        Me.BarCheckEditControls.Id = 5
+        Me.BarCheckEditControls.ImageOptions.Image = CType(resources.GetObject("BarCheckEditControls.ImageOptions.Image"), System.Drawing.Image)
+        Me.BarCheckEditControls.ImageOptions.LargeImage = CType(resources.GetObject("BarCheckEditControls.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.BarCheckEditControls.Name = "BarCheckEditControls"
+        '
         'RibbonPageCategory1
         '
         Me.RibbonPageCategory1.Name = "RibbonPageCategory1"
-        Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage2})
+        Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageFormDesigner})
         Me.RibbonPageCategory1.Text = "Form Designer"
         '
-        'RibbonPage2
+        'RibbonPageFormDesigner
         '
-        Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
-        Me.RibbonPage2.Name = "RibbonPage2"
-        Me.RibbonPage2.Text = "Allgemein"
+        Me.RibbonPageFormDesigner.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
+        Me.RibbonPageFormDesigner.Name = "RibbonPageFormDesigner"
+        Me.RibbonPageFormDesigner.Text = "Allgemein"
         '
         'RibbonPageGroup2
         '
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckEditControls)
         Me.RibbonPageGroup2.ItemLinks.Add(Me.BarCheckEditLayout)
         Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
         Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
@@ -95,11 +115,12 @@ Partial Class frmFormDesigner
         '
         Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 508)
         Me.RibbonStatusBar.Name = "RibbonStatusBar"
-        Me.RibbonStatusBar.Ribbon = Me.RibbonControl
+        Me.RibbonStatusBar.Ribbon = Me.FormDesignerRibbon
         Me.RibbonStatusBar.Size = New System.Drawing.Size(870, 21)
         '
         'LayoutControlMain
         '
+        Me.LayoutControlMain.AllowCustomization = False
         Me.LayoutControlMain.AllowDrop = True
         Me.LayoutControlMain.BackColor = System.Drawing.Color.Transparent
         Me.LayoutControlMain.Dock = System.Windows.Forms.DockStyle.Fill
@@ -110,7 +131,7 @@ Partial Class frmFormDesigner
         Me.LayoutControlMain.OptionsCustomizationForm.ShowLoadButton = False
         Me.LayoutControlMain.OptionsCustomizationForm.ShowSaveButton = False
         Me.LayoutControlMain.Root = Me.LayoutControlGroupMain
-        Me.LayoutControlMain.Size = New System.Drawing.Size(624, 362)
+        Me.LayoutControlMain.Size = New System.Drawing.Size(655, 362)
         Me.LayoutControlMain.TabIndex = 2
         Me.LayoutControlMain.Text = "LayoutControl1"
         '
@@ -119,7 +140,7 @@ Partial Class frmFormDesigner
         Me.LayoutControlGroupMain.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.LayoutControlGroupMain.GroupBordersVisible = False
         Me.LayoutControlGroupMain.Name = "Root"
-        Me.LayoutControlGroupMain.Size = New System.Drawing.Size(624, 362)
+        Me.LayoutControlGroupMain.Size = New System.Drawing.Size(655, 362)
         Me.LayoutControlGroupMain.TextVisible = False
         '
         'ToolboxControlMain
@@ -134,7 +155,7 @@ Partial Class frmFormDesigner
         Me.ToolboxControlMain.OptionsView.ShowToolboxCaption = True
         Me.ToolboxControlMain.SelectedGroup = Me.ToolboxGroupMain
         Me.ToolboxControlMain.SelectedGroupIndex = 0
-        Me.ToolboxControlMain.Size = New System.Drawing.Size(232, 337)
+        Me.ToolboxControlMain.Size = New System.Drawing.Size(201, 337)
         Me.ToolboxControlMain.TabIndex = 4
         Me.ToolboxControlMain.Text = "Form Controls"
         '
@@ -194,37 +215,39 @@ Partial Class frmFormDesigner
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
         '
-        'XtraTabControl1
+        'XtraTabControlMain
         '
-        Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom
-        Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
-        Me.XtraTabControl1.Name = "XtraTabControl1"
-        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageControls
-        Me.XtraTabControl1.Size = New System.Drawing.Size(234, 362)
-        Me.XtraTabControl1.TabIndex = 7
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageControls, Me.XtraTabPageProperties})
+        Me.XtraTabControlMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.XtraTabControlMain.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom
+        Me.XtraTabControlMain.Location = New System.Drawing.Point(0, 0)
+        Me.XtraTabControlMain.Name = "XtraTabControlMain"
+        Me.XtraTabControlMain.SelectedTabPage = Me.XtraTabPageControls
+        Me.XtraTabControlMain.Size = New System.Drawing.Size(203, 362)
+        Me.XtraTabControlMain.TabIndex = 7
+        Me.XtraTabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageControls, Me.XtraTabPageProperties})
         '
         'XtraTabPageControls
         '
         Me.XtraTabPageControls.Controls.Add(Me.ToolboxControlMain)
         Me.XtraTabPageControls.Name = "XtraTabPageControls"
-        Me.XtraTabPageControls.Size = New System.Drawing.Size(232, 337)
+        Me.XtraTabPageControls.Size = New System.Drawing.Size(201, 337)
         Me.XtraTabPageControls.Text = "Controls"
         '
         'XtraTabPageProperties
         '
         Me.XtraTabPageProperties.Controls.Add(Me.PropertyGridControlMain)
         Me.XtraTabPageProperties.Name = "XtraTabPageProperties"
-        Me.XtraTabPageProperties.Size = New System.Drawing.Size(232, 337)
+        Me.XtraTabPageProperties.PageEnabled = False
+        Me.XtraTabPageProperties.Size = New System.Drawing.Size(201, 337)
         Me.XtraTabPageProperties.Text = "Eigenschaften"
         '
         'PropertyGridControlMain
         '
+        Me.PropertyGridControlMain.Cursor = System.Windows.Forms.Cursors.Hand
         Me.PropertyGridControlMain.Dock = System.Windows.Forms.DockStyle.Fill
         Me.PropertyGridControlMain.Location = New System.Drawing.Point(0, 0)
         Me.PropertyGridControlMain.Name = "PropertyGridControlMain"
-        Me.PropertyGridControlMain.Size = New System.Drawing.Size(232, 337)
+        Me.PropertyGridControlMain.Size = New System.Drawing.Size(201, 337)
         Me.PropertyGridControlMain.TabIndex = 0
         '
         'SplitContainerMain
@@ -234,11 +257,12 @@ Partial Class frmFormDesigner
         Me.SplitContainerMain.Location = New System.Drawing.Point(0, 146)
         Me.SplitContainerMain.Name = "SplitContainerMain"
         Me.SplitContainerMain.Panel1.Controls.Add(Me.LayoutControlMain)
-        Me.SplitContainerMain.Panel1.Text = "Panel1"
-        Me.SplitContainerMain.Panel2.Controls.Add(Me.XtraTabControl1)
-        Me.SplitContainerMain.Panel2.Text = "Panel2"
+        Me.SplitContainerMain.Panel1.Text = "PanelMain"
+        Me.SplitContainerMain.Panel2.Controls.Add(Me.XtraTabControlMain)
+        Me.SplitContainerMain.Panel2.MinSize = 200
+        Me.SplitContainerMain.Panel2.Text = "PanelSidebar"
         Me.SplitContainerMain.Size = New System.Drawing.Size(870, 362)
-        Me.SplitContainerMain.SplitterPosition = 624
+        Me.SplitContainerMain.SplitterPosition = 655
         Me.SplitContainerMain.TabIndex = 3
         Me.SplitContainerMain.Text = "SplitContainerControl1"
         '
@@ -249,16 +273,18 @@ Partial Class frmFormDesigner
         Me.ClientSize = New System.Drawing.Size(870, 529)
         Me.Controls.Add(Me.SplitContainerMain)
         Me.Controls.Add(Me.RibbonStatusBar)
-        Me.Controls.Add(Me.RibbonControl)
+        Me.Controls.Add(Me.FormDesignerRibbon)
+        Me.DefaultRibbonPage = Me.RibbonPageFormDesigner
         Me.Name = "frmFormDesigner"
-        Me.Ribbon = Me.RibbonControl
+        Me.Ribbon = Me.FormDesignerRibbon
+        Me.ShowIcon = False
         Me.StatusBar = Me.RibbonStatusBar
         Me.Text = "Form Designer"
-        CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.FormDesignerRibbon, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlMain, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabControl1.ResumeLayout(False)
+        CType(Me.XtraTabControlMain, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabControlMain.ResumeLayout(False)
         Me.XtraTabPageControls.ResumeLayout(False)
         Me.XtraTabPageProperties.ResumeLayout(False)
         CType(Me.PropertyGridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
@@ -269,7 +295,7 @@ Partial Class frmFormDesigner
 
     End Sub
 
-    Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents FormDesignerRibbon As DevExpress.XtraBars.Ribbon.RibbonControl
     Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents LayoutControlMain As DevExpress.XtraLayout.LayoutControl
     Friend WithEvents LayoutControlGroupMain As DevExpress.XtraLayout.LayoutControlGroup
@@ -279,7 +305,7 @@ Partial Class frmFormDesigner
     Friend WithEvents ToolboxItemTextbox As DevExpress.XtraToolbox.ToolboxItem
     Friend WithEvents ToolboxItemMemoedit As DevExpress.XtraToolbox.ToolboxItem
     Friend WithEvents ToolboxItemDatepicker As DevExpress.XtraToolbox.ToolboxItem
-    Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
+    Friend WithEvents XtraTabControlMain As DevExpress.XtraTab.XtraTabControl
     Friend WithEvents XtraTabPageControls As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents XtraTabPageProperties As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents PropertyGridControlMain As DevExpress.XtraVerticalGrid.PropertyGridControl
@@ -288,6 +314,7 @@ Partial Class frmFormDesigner
     Friend WithEvents ToolboxItemCheckbox As DevExpress.XtraToolbox.ToolboxItem
     Friend WithEvents BarCheckEditLayout As DevExpress.XtraBars.BarCheckItem
     Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory
-    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageFormDesigner As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarCheckEditControls As DevExpress.XtraBars.BarCheckItem
 End Class
diff --git a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.resx b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.resx
index 3357c924..13eb9095 100644
--- a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.resx
+++ b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.resx
@@ -120,23 +120,43 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BarCheckEditLayout.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAG3RFWHRUaXRsZQBPdXRsaW5l
-        O0JvcmRlcjtDb2xvcjtFPhLAAAAAiklEQVQ4T5WSyw2AIBBE6Yk6bMpQlL14924BsjrIEkJm+WzyQjLZ
-        NxjViQhl2w8L/yE4sedCCDJC57xuiDU+FcxMJesTJKYK2M16DguIrKDkfwfWjGRgFuSlVtS8fBVakJda
-        UfMiA6tAl7sy6BWoZMogFdQ8MdYFXRnQ33gFGq5AwxVouAIN5xH3Aj5Jzm636GRiAAAAAElFTkSuQmCC
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE91dGxpbmU7Qm9yZGVyO0NvbG9y
+        O0U+EsAAAACKSURBVDhPlZLLDYAgEETpiTpsylCUvXj3bgGyOsgSQmb5bPJCMtk3GNWJCGXbDwv/ITix
+        50IIMkLnvG6INT4VzEwl6xMkpgrYzXoOC4isoOR/B9aMZGAW5KVW1Lx8FVqQl1pR8yIDq0CXuzLoFahk
+        yiAV1Dwx1gVdGdDfeAUarkDDFWi4Ag3nEfcCPknObrfoZGIAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="BarCheckEditLayout.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAG3RFWHRUaXRsZQBPdXRsaW5l
-        O0JvcmRlcjtDb2xvcjtFPhLAAAABDUlEQVRYR72S0Q2DMAxE2Yk5ulTFUB2iG/S//50gvYswSuEIaWI5
-        0hNg4XtH1Sml5M7t/lDMIK3wPr97WPaA4TtK+VaC78qAURB+JTdmGeAFBQWqgF70AOGl9LTEtCxL8sLO
-        6/05iIAqMecCnudEbpQleJ1cC1zIDSuR/6RuBRrlZJMTlwK9cjJcoFeO1cxQgZEvx/pYgRE5QUR/gVE5
-        QUxfAQ85QVS1wHO9/hwvOUHcf7+Ap5wgsr2At5wgtr0AFiy8lO1plhPE/l3AJOVzOZeiMxDbVcBk+2cp
-        qYHY7gImtasUEKxekgvU4EGY4vLLTVJDDiORw0jkMBI5jEQOI5HDSOQwEjmMRA7jSNMXcaR3S692HfcA
-        AAAASUVORK5CYII=
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE91dGxpbmU7Qm9yZGVyO0NvbG9y
+        O0U+EsAAAAENSURBVFhHvZLRDYMwDETZiTm6VMVQHaIb9L//nSC9izBK4QhpYjnSE2Dhe0fVKaXkzu3+
+        UMwgrfA+v3tY9oDhO0r5VoLvyoBREH4lN2YZ4AUFBaqAXvQA4aX0tMS0LEvyws7r/TmIgCox5wKe50Ru
+        lCV4nVwLXMgNK5H/pG4FGuVkkxOXAr1yMlygV47VzFCBkS/H+liBETlBRH+BUTlBTF8BDzlBVLXAc73+
+        HC85Qdx/v4CnnCCyvYC3nCC2vQAWLLyU7WmWE8T+XcAk5XM5l6IzENtVwGT7ZympgdjuAia1qxQQrF6S
+        C9TgQZji8stNUkMOI5HDSOQwEjmMRA4jkcNI5DASOYxEDuNI0xdxpHdLr3Yd9wAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="BarCheckEditControls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAgdEVYdFRpdGxlAEVkaXQ7QmFycztSaWJib247U3Rh
+        bmRhcmQ7MBPD2wAAAIxJREFUOE+tkksOgCAMBbkT5/BShjXn4S7GrXu3LqytsVgawk9fMsGkvEENBgA+
+        ER+cc1DgfFYry0QiKIXm3vtVS7oEmENLugQSTJ9A5hcBMi6gDAuWbYdpDoztEnBZSpoF6mTCNgsyZab+
+        CaUyUv+JtDn3+jgyuKYCDYVLQhKvcSLQoOCGBVym0kswFwCbJlIIfiUIAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BarCheckEditControls.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAgdEVYdFRpdGxlAEVkaXQ7QmFycztSaWJib247U3Rh
+        bmRhcmQ7MBPD2wAAASZJREFUWEftkkEOgjAQRbkTtzDxUoYtR+Ae3sWwMmHvVhf1f2SStozQNm3ZMMkL
+        MDDzn0hjjDkUtVkTtVkTtVkTtUm6rjORPMEFcHaFlkHUJsEQDuHF5/u+/wzDcMGlv8u5tlGbJEVgHEdV
+        opoAS5OoKsDyJaoLsBaJNyUOEWCJBO6tPkxBbZIUgQ0mPKLmqE3CwVy17FJz1CY5BU6BnAKs6+3eAh7l
+        fM5ZBQs5BR7TS4JtWtwqL2CF229gBlVWQPnljgSqnMCf105EotxfsBEulPsIQ8MJHs8rEBNOMJJPICWc
+        OKE2MQKx4QRjM06oDQX2YKWEE8lxQlPAMgnxg6W/Cicy7yxLAcvssKBwIvPOshSwzA/dDScy7yxLActs
+        gaBw8ps3zRc04YO9+3Zd0gAAAABJRU5ErkJggg==
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.vb b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.vb
index 919716a3..41522de0 100644
--- a/EDMI_ClientSuite/FormDesigner/frmFormDesigner.vb
+++ b/EDMI_ClientSuite/FormDesigner/frmFormDesigner.vb
@@ -105,6 +105,8 @@ Public Class frmFormDesigner
     End Sub
 
     Private Async Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        FormDesignerRibbon.SelectPage(RibbonPageFormDesigner)
+
         _ControlLoader = New ControlLoader(My.LogConfig, LayoutControlGroupMain)
 
         Dim oTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId)
@@ -117,31 +119,78 @@ Public Class frmFormDesigner
     End Function
 
     Private Sub LayoutControlMain_ItemSelectionChanged(sender As Object, e As EventArgs) Handles LayoutControlMain.ItemSelectionChanged
-        ' TODO: Load Property Grid for selected item
+        ' only layout control items have properties
+        If TypeOf sender IsNot LayoutControlItem Then
+            Exit Sub
+        End If
+
         Dim oLayoutItem As LayoutControlItem = DirectCast(sender, LayoutControlItem)
         Dim oSelectedControl As BaseEdit = oLayoutItem.Control
-        Dim oMetadata As Metadata = oSelectedControl.Tag
+        Dim oMetadata As Metadata
+
+        ' Don't load properties for layout items like splitters, separators, etc.
+        If oLayoutItem.Control Is Nothing Then
+            Exit Sub
+        End If
+
+
+        oMetadata = oSelectedControl.Tag
 
         Select Case oSelectedControl.GetType
             Case GetType(MemoEdit)
-
+                PropertyGridControlMain.SelectedObject = New MemoeditProperties() With {
+                    .Id = oMetadata.Id,
+                    .Name = oMetadata.Caption
+                }
             Case GetType(TextEdit)
-
+                PropertyGridControlMain.SelectedObject = New TextboxProperties() With {
+                    .Id = oMetadata.Id,
+                    .Name = oMetadata.Caption
+                }
             Case GetType(LookupControl2)
                 PropertyGridControlMain.SelectedObject = New ComboboxProperties() With {
                     .Datasource = New DatasourceType,
-                    .Id = oMetadata.Id
+                    .Id = oMetadata.Id,
+                    .Name = oMetadata.Caption
+                }
+            Case GetType(DateEdit)
+                PropertyGridControlMain.SelectedObject = New DatepickerProperties() With {
+                    .Id = oMetadata.Id,
+                    .Name = oMetadata.Caption
+                }
+            Case GetType(CheckEdit)
+                PropertyGridControlMain.SelectedObject = New CheckboxProperties() With {
+                    .Id = oMetadata.Id,
+                    .Name = oMetadata.Caption
                 }
         End Select
-
-
     End Sub
 
     Private Sub BarCheckEditLayout_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckEditLayout.CheckedChanged
         If BarCheckEditLayout.Checked Then
             LayoutControlMain.ShowCustomizationForm()
-        Else
-            LayoutControlMain.HideCustomizationForm()
+            XtraTabPageProperties.PageEnabled = True
+            XtraTabPageControls.PageEnabled = False
+            XtraTabControlMain.SelectedTabPage = XtraTabPageProperties
         End If
     End Sub
+
+    Private Sub BarCheckEditControls_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckEditControls.CheckedChanged
+        If BarCheckEditControls.Checked Then
+            LayoutControlMain.HideCustomizationForm()
+            XtraTabPageProperties.PageEnabled = False
+            XtraTabPageControls.PageEnabled = True
+            XtraTabControlMain.SelectedTabPage = XtraTabPageControls
+        End If
+    End Sub
+
+    Private Sub LayoutControlMain_HideCustomization(sender As Object, e As EventArgs) Handles LayoutControlMain.HideCustomization
+        BarCheckEditControls.Checked = True
+    End Sub
+
+    Private Sub LayoutControlMain_ShowCustomization(sender As Object, e As EventArgs) Handles LayoutControlMain.ShowCustomization
+        BarCheckEditLayout.Checked = True
+    End Sub
+
+
 End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb
index 5c6b89a1..cf5e819f 100644
--- a/EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb
+++ b/EDMI_ClientSuite/FormUserManager/frmUserManager.Designer.vb
@@ -1,6 +1,8 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmUserManager
-    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+    Inherits BaseRibbonForm
 
     'Form overrides dispose to clean up the component list.
     <System.Diagnostics.DebuggerNonUserCode()>
@@ -172,6 +174,7 @@ Partial Class frmUserManager
         Me.Controls.Add(Me.UserNavbar)
         Me.Controls.Add(Me.RibbonStatusBar)
         Me.Controls.Add(Me.UserRibbon)
+        Me.DefaultRibbonPage = Me.RibbonPageUserManager
         Me.Name = "frmUserManager"
         Me.Ribbon = Me.UserRibbon
         Me.ShowIcon = False
diff --git a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb
index 325823d1..38ee7d01 100644
--- a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb
+++ b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb
@@ -22,22 +22,9 @@ Public Class frmUserManager
     Private Async Sub frmUserManager_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Await InitDataAsync()
 
-        UserRibbon.SelectPage(RibbonPageUserManager)
         UserNavbar.SelectedItem = NavbarUser2Group
     End Sub
 
-    Private Sub frmUserManager_VisibleChanged(sender As Object, e As EventArgs) Handles Me.VisibleChanged
-        If Visible Then
-            UserRibbon.SelectPage(RibbonPageUserManager)
-        End If
-    End Sub
-
-    Private Sub frmUserManager_Activated(sender As Object, e As EventArgs) Handles Me.Activated
-        If Visible Then
-            UserRibbon.SelectPage(RibbonPageUserManager)
-        End If
-    End Sub
-
     Private Sub ShowUserToGroupControl()
         If _UserToGroupControl Is Nothing Then
             _UserToGroupControl = New UserControlAssignment() With {
diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb
index 63af073b..79873166 100644
--- a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb
+++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmWorkflowStep
     Inherits BaseRibbonForm
 
diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx
index 511dc5c8..8d76c874 100644
--- a/EDMI_ClientSuite/My Project/licenses.licx	
+++ b/EDMI_ClientSuite/My Project/licenses.licx	
@@ -1,14 +1,15 @@
-DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/EDMI_ClientSuite/_TEST/frmDocTest.Designer.vb b/EDMI_ClientSuite/_TEST/frmDocTest.Designer.vb
index 444f4575..3c41f2b8 100644
--- a/EDMI_ClientSuite/_TEST/frmDocTest.Designer.vb
+++ b/EDMI_ClientSuite/_TEST/frmDocTest.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDocTest
     Inherits BaseForm
 
diff --git a/EDMI_ClientSuite/_TEST/frmFileTest.Designer.vb b/EDMI_ClientSuite/_TEST/frmFileTest.Designer.vb
index c7eafa56..3ac42dc9 100644
--- a/EDMI_ClientSuite/_TEST/frmFileTest.Designer.vb
+++ b/EDMI_ClientSuite/_TEST/frmFileTest.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmFileTest
     Inherits BaseForm
 
diff --git a/EDMI_ClientSuite/frmHome.Designer.vb b/EDMI_ClientSuite/frmHome.Designer.vb
index ccc3d183..6967bbf2 100644
--- a/EDMI_ClientSuite/frmHome.Designer.vb
+++ b/EDMI_ClientSuite/frmHome.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmHome
     Inherits BaseRibbonForm
 
diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb
index 2136923e..05fcebf0 100644
--- a/EDMI_ClientSuite/frmMain.Designer.vb
+++ b/EDMI_ClientSuite/frmMain.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmMain
     Inherits BaseRibbonForm
 
diff --git a/EDMI_ClientSuite/frmObjectEditor.Designer.vb b/EDMI_ClientSuite/frmObjectEditor.Designer.vb
index 599aff3f..3a4b80c4 100644
--- a/EDMI_ClientSuite/frmObjectEditor.Designer.vb
+++ b/EDMI_ClientSuite/frmObjectEditor.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmObjectEditor
     Inherits BaseRibbonForm
 
diff --git a/EDMI_ClientSuite/frmSearch.Designer.vb b/EDMI_ClientSuite/frmSearch.Designer.vb
index c3f5e582..cb8a4a76 100644
--- a/EDMI_ClientSuite/frmSearch.Designer.vb
+++ b/EDMI_ClientSuite/frmSearch.Designer.vb
@@ -1,4 +1,6 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Imports DigitalData.GUIs.ClientSuite.Base
+
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmSearch
     Inherits BaseRibbonForm