diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb
index 32d86590..bad872d8 100644
--- a/GUIs.Common/DocumentResultList/Layout.vb
+++ b/GUIs.Common/DocumentResultList/Layout.vb
@@ -1,5 +1,6 @@
 Imports DevExpress.Utils
 Imports DevExpress.XtraBars.Docking
+Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
@@ -10,12 +11,18 @@ Namespace DocumentResultList
         Inherits BaseClass
 
         Private Config As ConfigManager(Of Config)
+        Private GridViews As List(Of GridView)
 
-        Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config))
+        Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config), pGridViews As List(Of GridView))
             MyBase.New(pLogConfig)
             Config = pConfig
+            GridViews = pGridViews
         End Sub
 
+#Region "Saving and Restoring layout"
+
+
+
         Public Sub DockManager_SaveLayout(pDockManager As DockManager)
             Try
                 Dim oXml As String = GetDockmanager_LayoutName()
@@ -69,6 +76,44 @@ Namespace DocumentResultList
             Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath)
             Return IO.Path.Combine(oDirectory, Filename)
         End Function
+#End Region
+
+        Public Sub SetGroupPanelVisible(pVisible As Boolean)
+            For Each oView In GridViews
+                oView.OptionsView.ShowGroupPanel = pVisible
+            Next
+        End Sub
+
+        Public Function GetGroupPanelVisible() As Boolean
+            Dim oView = GridViews.First()
+            Return oView.OptionsView.ShowGroupPanel
+        End Function
+
+        Public Sub SetFilterRowVisible(pVisible As Boolean)
+            For Each oView In GridViews
+                oView.OptionsView.ShowAutoFilterRow = pVisible
+            Next
+        End Sub
+
+        Public Function GetFilterRowVisible() As Boolean
+            Dim oView = GridViews.First()
+            Return oView.OptionsView.ShowAutoFilterRow
+        End Function
+
+        Public Sub SetBandTitleVisible(pVisible As Boolean)
+            For Each oView In GridViews
+                DirectCast(oView, BandedGridView).OptionsView.ShowBands = pVisible
+            Next
+        End Sub
+
+        Public Function GetBandTitleVisible() As Boolean
+            Dim oView = GridViews.First()
+            Return DirectCast(oView, BandedGridView).OptionsView.ShowBands
+        End Function
+
     End Class
 
+
+
+
 End Namespace
\ No newline at end of file
diff --git a/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb
index 370a17b2..f7aa0de0 100644
--- a/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb
+++ b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb
@@ -64,36 +64,57 @@ Public Class AttributeControls
         End Try
     End Function
 
-    Public Async Function LoadControlsForAttributes(pObjectId As Long, pAttributes As List(Of Attribute), LayoutRoot As LayoutControlGroup) As Task
+    Public Sub LoadControlsForAttributes(pAttributes As List(Of Attribute), LayoutRoot As LayoutControlGroup)
         LayoutRoot.Clear()
 
+        Dim oUserAttributeGroup = LayoutRoot.AddGroup()
+        oUserAttributeGroup.Text = "Benutzer Attribute"
+
+        Dim oSystemAttributeGroup = LayoutRoot.AddGroup()
+        oSystemAttributeGroup.Text = "System Attribute"
+
         For Each oAttribute As Attribute In pAttributes
             Dim oEditable = ShouldControlBeEditable(oAttribute)
             Dim oControl = GetControlForAttribute(oAttribute, Not oEditable)
-
+            Dim oParentGroup = oSystemAttributeGroup
             ' Add new control
-            Dim oItem As LayoutControlItem = LayoutRoot.AddItem()
 
+            If oAttribute.IsSystem = False Then
+                oParentGroup = oUserAttributeGroup
+            End If
+
+            Dim oItem As LayoutControlItem = oParentGroup.AddItem()
             oItem.Text = oAttribute.Title
             oItem.Name = oAttribute.Title
             oItem.Control = oControl
         Next
+    End Sub
 
-        For Each oItem As LayoutControlItem In LayoutRoot.Items
-            If TypeOf oItem.Control Is BaseEdit Then
-                Dim oValue = Await GetAttributeValue(oItem.Name, pObjectId)
-                Dim oEdit = DirectCast(oItem.Control, BaseEdit)
+    Public Async Function LoadControlValuesForAttributes(pObjectId As Long, LayoutRoot As LayoutControlGroup) As Task
+        For Each oItem As BaseLayoutItem In LayoutRoot.Items
+            If TypeOf oItem Is LayoutControlGroup Then
+                Await LoadControlValuesForAttributes(pObjectId, oItem)
 
-                oEdit.EditValue = oValue
+            ElseIf TypeOf oItem Is LayoutControlItem Then
+                Dim oControlItem As LayoutControlItem = oItem
 
-                AddHandler oEdit.EditValueChanged, Sub() RaiseEvent EditValueChanged(oItem, Nothing)
+                If TypeOf oControlItem.Control Is BaseEdit Then
+                    Dim oEdit = DirectCast(oControlItem.Control, BaseEdit)
+                    oEdit.EditValue = Nothing
 
-            ElseIf TypeOf oItem.Control Is GridControl Then
-                Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, pObjectId)
-                Dim oGrid = DirectCast(oItem.Control, GridControl)
-                oGrid.DataSource = oValueTable
+                    Dim oValue = Await GetAttributeValue(oItem.Name, pObjectId)
+                    oEdit.EditValue = oValue
 
+                    AddHandler oEdit.EditValueChanged, Sub() RaiseEvent EditValueChanged(oItem, Nothing)
+                ElseIf TypeOf oControlItem.Control Is GridControl Then
+                    Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, pObjectId)
+                    Dim oGrid = DirectCast(oControlItem.Control, GridControl)
 
+                    oGrid.DataSource = Nothing
+
+                    oGrid.DataSource = oValueTable
+
+                End If
             End If
         Next
     End Function
diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb
index c805ba0b..d8e206db 100644
--- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb
+++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb
@@ -59,6 +59,7 @@ Partial Class ctrlObjectPropertyDialog
         Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage()
         Me.GridValueHistory = New DevExpress.XtraGrid.GridControl()
         Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.XtraTabPageVersions = New DevExpress.XtraTab.XtraTabPage()
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.d = New DevExpress.XtraBars.Bar()
         Me.cmbEntityId = New DevExpress.XtraBars.BarEditItem()
@@ -67,7 +68,6 @@ Partial Class ctrlObjectPropertyDialog
         Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
-        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
         BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl1.SuspendLayout()
@@ -126,7 +126,7 @@ Partial Class ctrlObjectPropertyDialog
         Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageObject
         Me.XtraTabControl1.Size = New System.Drawing.Size(505, 693)
         Me.XtraTabControl1.TabIndex = 2
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageObject, Me.XtraTabPageAttributes, Me.XtraTabPageAttributeHistory, Me.XtraTabPage1})
+        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageAttributes, Me.XtraTabPageObject, Me.XtraTabPageAttributeHistory, Me.XtraTabPageVersions})
         '
         'XtraTabPageObject
         '
@@ -431,7 +431,7 @@ Partial Class ctrlObjectPropertyDialog
         Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill
         Me.LayoutControl2.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControl2.Name = "LayoutControl2"
-        Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(551, 406, 650, 400)
+        Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(624, 268, 650, 400)
         Me.LayoutControl2.Root = Me.Root
         Me.LayoutControl2.Size = New System.Drawing.Size(503, 668)
         Me.LayoutControl2.TabIndex = 0
@@ -467,6 +467,13 @@ Partial Class ctrlObjectPropertyDialog
         Me.GridView2.GridControl = Me.GridValueHistory
         Me.GridView2.Name = "GridView2"
         '
+        'XtraTabPageVersions
+        '
+        Me.XtraTabPageVersions.Name = "XtraTabPageVersions"
+        Me.XtraTabPageVersions.PageEnabled = False
+        Me.XtraTabPageVersions.Size = New System.Drawing.Size(503, 668)
+        Me.XtraTabPageVersions.Text = "Versionen"
+        '
         'BarManager1
         '
         Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.d})
@@ -540,12 +547,6 @@ Partial Class ctrlObjectPropertyDialog
         Me.barDockControlRight.Manager = Me.BarManager1
         Me.barDockControlRight.Size = New System.Drawing.Size(0, 693)
         '
-        'XtraTabPage1
-        '
-        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(503, 668)
-        Me.XtraTabPage1.Text = "Versionen"
-        '
         'ctrlObjectPropertyDialog
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -644,5 +645,5 @@ Partial Class ctrlObjectPropertyDialog
     Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl
     Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl
     Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl
-    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents XtraTabPageVersions As DevExpress.XtraTab.XtraTabPage
 End Class
diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
index c5b83e65..4c388733 100644
--- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
+++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
@@ -5,6 +5,7 @@ Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.ZooFlow
+Imports DevExpress.XtraSplashScreen
 
 Public Class ctrlObjectPropertyDialog
     Implements IBaseForm
@@ -18,7 +19,15 @@ Public Class ctrlObjectPropertyDialog
     Private Property ObjectId As Long
 
     Private ReadOnly Changes As New Dictionary(Of String, Object)
-    Private Property Loading As Boolean = False
+
+
+    Private Loading As Boolean = False
+
+    Private LastEntityId As Integer = 0
+
+    Private Sub ctrlObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles Me.Load
+        XtraTabControl1.SelectedTabPage = XtraTabPageAttributes
+    End Sub
 
     Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment)
         LogConfig = pLogConfig
@@ -44,6 +53,8 @@ Public Class ctrlObjectPropertyDialog
 
     Public Async Function LoadObject(pObjectId As Long, pEntityId As Long) As Task(Of Boolean)
         Loading = True
+        Dim oLoadingHandle = SplashScreenManager.ShowOverlayForm(Me)
+
         Try
             ObjectId = pObjectId
 
@@ -59,12 +70,27 @@ Public Class ctrlObjectPropertyDialog
             Dim oObjectProperties = Await GetPropertiesForObjectId(ObjectId)
             ShowObjectProperties(oObjectProperties)
 
-            ' Load Attribute controls and values
+
+            ' Load All attributes for current entity id
             Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(cmbEntityId.EditValue)
-            Await ControlManager.LoadControlsForAttributes(ObjectId, oAttributes, Root)
+
+            ' Load Attribute controls
+            If pEntityId <> LastEntityId Then
+                ControlManager.LoadControlsForAttributes(oAttributes, Root)
+            End If
+
+            ' Load values for all controls
+            Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
+
+            ' Save the current entity id
+            LastEntityId = pEntityId
+
+            Return True
         Catch ex As Exception
             Logger.Error(ex)
+            Return False
         Finally
+            SplashScreenManager.CloseOverlayForm(oLoadingHandle)
             Loading = False
         End Try
     End Function
@@ -166,15 +192,17 @@ Public Class ctrlObjectPropertyDialog
         Return oResult.Table
     End Function
 
-    Private Async Sub Load_Attributes(pObject As Long, pBusinessEntityId As Long)
+    Private Async Sub Load_Attributes(pObjectId As Long, pBusinessEntityId As Long)
         Try
             Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(pBusinessEntityId)
-
             If oAttributes.Count = 0 Then
-                MsgBox($"Es konnten keine Attribute für das Objekt '{pObject}' geladen werden!", MsgBoxStyle.Critical, Text)
+                MsgBox($"Es konnten keine Attribute für das Objekt '{pObjectId}' geladen werden!", MsgBoxStyle.Critical, Text)
             End If
 
-            Await ControlManager.LoadControlsForAttributes(pObject, oAttributes, Root)
+
+
+            ControlManager.LoadControlsForAttributes(oAttributes, Root)
+            Await ControlManager.LoadControlValuesForAttributes(pObjectId, Root)
         Catch ex As Exception
             Logger.Error(ex)
         End Try
@@ -184,7 +212,7 @@ Public Class ctrlObjectPropertyDialog
         Dim oEntityId As Long
 
         If Integer.TryParse(cmbEntityId.EditValue, oEntityId) AndAlso Loading = False Then
-            LoadObject(ObjectId, oEntityId)
+            Await LoadObject(ObjectId, oEntityId)
         End If
     End Sub
 End Class
diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
index fab034a3..6fabf108 100644
--- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
+++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
@@ -151,7 +151,8 @@ Public Class frmObjectPropertyDialog
                 MsgBox($"Es konnten keine Attribute für das Objekt '{ObjectId}' geladen werden!", MsgBoxStyle.Critical, Text)
             End If
 
-            Await ControlManager.LoadControlsForAttributes(ObjectId, oAttributes, AttributeLayout)
+            ControlManager.LoadControlsForAttributes(oAttributes, AttributeLayout)
+            Await ControlManager.LoadControlValuesForAttributes(ObjectId, AttributeLayout)
         Catch ex As Exception
             Logger.Error(ex)
         End Try
diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb
index e13986c2..00f8adc3 100644
--- a/GUIs.Common/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/frmDocumentResultList.Designer.vb
@@ -54,6 +54,9 @@ Partial Class frmDocumentResultList
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem()
+        Me.chkGridShowQuickfilter = New DevExpress.XtraBars.BarCheckItem()
+        Me.chkGridShowGrouping = New DevExpress.XtraBars.BarCheckItem()
+        Me.chkGridShowTitle = New DevExpress.XtraBars.BarCheckItem()
         Me.RibbonPageCategoryFile = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
         Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -61,14 +64,16 @@ Partial Class frmDocumentResultList
         Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageExport = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageExport = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
         Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
         Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -177,14 +182,13 @@ Partial Class frmDocumentResultList
         '
         'RibbonControl
         '
-        Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified
         Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle})
         resources.ApplyResources(Me.RibbonControl, "RibbonControl")
-        Me.RibbonControl.MaxItemId = 40
+        Me.RibbonControl.MaxItemId = 43
         Me.RibbonControl.Name = "RibbonControl"
         Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile})
-        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2, Me.RibbonPageExport})
+        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPageExport, Me.RibbonPage2})
         Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2})
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl.ShowToolbarCustomizeItem = False
@@ -396,6 +400,24 @@ Partial Class frmDocumentResultList
         Me.BarButtonItem10.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.enablescrolling
         Me.BarButtonItem10.Name = "BarButtonItem10"
         '
+        'chkGridShowQuickfilter
+        '
+        resources.ApplyResources(Me.chkGridShowQuickfilter, "chkGridShowQuickfilter")
+        Me.chkGridShowQuickfilter.Id = 40
+        Me.chkGridShowQuickfilter.Name = "chkGridShowQuickfilter"
+        '
+        'chkGridShowGrouping
+        '
+        resources.ApplyResources(Me.chkGridShowGrouping, "chkGridShowGrouping")
+        Me.chkGridShowGrouping.Id = 41
+        Me.chkGridShowGrouping.Name = "chkGridShowGrouping"
+        '
+        'chkGridShowTitle
+        '
+        resources.ApplyResources(Me.chkGridShowTitle, "chkGridShowTitle")
+        Me.chkGridShowTitle.Id = 42
+        Me.chkGridShowTitle.Name = "chkGridShowTitle"
+        '
         'RibbonPageCategoryFile
         '
         Me.RibbonPageCategoryFile.Appearance.BackColor = System.Drawing.Color.DarkGreen
@@ -434,19 +456,24 @@ Partial Class frmDocumentResultList
         '
         'RibbonPage3
         '
-        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4})
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup8})
         Me.RibbonPage3.Name = "RibbonPage3"
         resources.ApplyResources(Me.RibbonPage3, "RibbonPage3")
         '
         'RibbonPageGroup4
         '
         Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem7)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem8)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10)
         Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
         resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
         '
+        'RibbonPageGroup8
+        '
+        Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem9)
+        Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem8)
+        Me.RibbonPageGroup8.ItemLinks.Add(Me.BarButtonItem10)
+        Me.RibbonPageGroup8.Name = "RibbonPageGroup8"
+        resources.ApplyResources(Me.RibbonPageGroup8, "RibbonPageGroup8")
+        '
         'RibbonPage1
         '
         Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup5})
@@ -467,9 +494,21 @@ Partial Class frmDocumentResultList
         Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
         resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
         '
+        'RibbonPageExport
+        '
+        Me.RibbonPageExport.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
+        Me.RibbonPageExport.Name = "RibbonPageExport"
+        resources.ApplyResources(Me.RibbonPageExport, "RibbonPageExport")
+        '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItemExportGrid1)
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
+        '
         'RibbonPage2
         '
-        Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Layout, Me.RibbonPageGroup1})
+        Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup9, Me.RibbonPageGroup_Layout})
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
@@ -482,23 +521,18 @@ Partial Class frmDocumentResultList
         '
         'RibbonPageGroup1
         '
-        Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
         Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetLayout)
         Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem6)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
-        'RibbonPageExport
+        'RibbonPageGroup9
         '
-        Me.RibbonPageExport.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
-        Me.RibbonPageExport.Name = "RibbonPageExport"
-        resources.ApplyResources(Me.RibbonPageExport, "RibbonPageExport")
-        '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItemExportGrid1)
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
+        Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowQuickfilter)
+        Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping)
+        Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle)
+        Me.RibbonPageGroup9.Name = "RibbonPageGroup9"
+        resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9")
         '
         'RepositoryItemTextEdit1
         '
@@ -792,4 +826,9 @@ Partial Class frmDocumentResultList
     Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
+    Friend WithEvents chkGridShowQuickfilter As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents chkGridShowGrouping As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents chkGridShowTitle As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroup9 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class
diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx
index d1750f5e..63ffa7db 100644
--- a/GUIs.Common/frmDocumentResultList.resx
+++ b/GUIs.Common/frmDocumentResultList.resx
@@ -459,6 +459,15 @@
   <data name="BarButtonItem10.Caption" xml:space="preserve">
     <value>Versionieren</value>
   </data>
+  <data name="chkGridShowQuickfilter.Caption" xml:space="preserve">
+    <value>Schnellfilter anzeigen</value>
+  </data>
+  <data name="chkGridShowGrouping.Caption" xml:space="preserve">
+    <value>Gruppierung anzeigen</value>
+  </data>
+  <data name="chkGridShowTitle.Caption" xml:space="preserve">
+    <value>Titel anzeigen</value>
+  </data>
   <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -477,6 +486,9 @@
   <data name="RibbonPageGroup4.Text" xml:space="preserve">
     <value>RibbonPageGroup4</value>
   </data>
+  <data name="RibbonPageGroup8.Text" xml:space="preserve">
+    <value>RibbonPageGroup8</value>
+  </data>
   <data name="RibbonPage3.Text" xml:space="preserve">
     <value>Aktionen 2</value>
   </data>
@@ -492,21 +504,24 @@
   <data name="RibbonPage1.Text" xml:space="preserve">
     <value>Start</value>
   </data>
-  <data name="RibbonPageGroup_Layout.Text" xml:space="preserve">
-    <value>Layout</value>
-  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>RibbonPageGroup1</value>
-  </data>
-  <data name="RibbonPage2.Text" xml:space="preserve">
-    <value>Layout</value>
-  </data>
   <data name="RibbonPageGroup2.Text" xml:space="preserve">
     <value>RibbonPageGroup2</value>
   </data>
   <data name="RibbonPageExport.Text" xml:space="preserve">
     <value>Export</value>
   </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>RibbonPageGroup1</value>
+  </data>
+  <data name="RibbonPageGroup9.Text" xml:space="preserve">
+    <value>Tabellen Einstellungen</value>
+  </data>
+  <data name="RibbonPageGroup_Layout.Text" xml:space="preserve">
+    <value>Layout</value>
+  </data>
+  <data name="RibbonPage2.Text" xml:space="preserve">
+    <value>Layout</value>
+  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="RepositoryItemTextEdit1.AutoHeight" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -515,7 +530,7 @@
     <value>False</value>
   </data>
   <data name="RibbonControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1189, 89</value>
+    <value>1189, 158</value>
   </data>
   <data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 647</value>
@@ -548,7 +563,7 @@
     <value>4</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>568, 529</value>
+    <value>568, 460</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -719,7 +734,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>578, 529</value>
+    <value>578, 460</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -746,7 +761,7 @@
     <value>0, 0</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 528</value>
+    <value>318, 459</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -785,7 +800,7 @@
     <value>3, 26</value>
   </data>
   <data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 528</value>
+    <value>318, 459</value>
   </data>
   <data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -803,10 +818,10 @@
     <value>0</value>
   </data>
   <data name="DockPanelDocViewer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>585, 89</value>
+    <value>585, 158</value>
   </data>
   <data name="DockPanelDocViewer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>324, 558</value>
+    <value>324, 489</value>
   </data>
   <data name="DockPanelDocViewer.Text" xml:space="preserve">
     <value>Vorschau</value>
@@ -830,7 +845,7 @@
     <value>0, 0</value>
   </data>
   <data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
-    <value>273, 529</value>
+    <value>273, 460</value>
   </data>
   <data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -851,7 +866,7 @@
     <value>4, 26</value>
   </data>
   <data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>273, 529</value>
+    <value>273, 460</value>
   </data>
   <data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -869,10 +884,10 @@
     <value>0</value>
   </data>
   <data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>909, 89</value>
+    <value>909, 158</value>
   </data>
   <data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
-    <value>280, 558</value>
+    <value>280, 489</value>
   </data>
   <data name="DockPanelMetadata.Text" xml:space="preserve">
     <value>Mehr</value>
@@ -893,7 +908,7 @@
     <value>3, 26</value>
   </data>
   <data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>578, 529</value>
+    <value>578, 460</value>
   </data>
   <data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -911,10 +926,10 @@
     <value>0</value>
   </data>
   <data name="DockPanelFileList.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 89</value>
+    <value>0, 158</value>
   </data>
   <data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>585, 558</value>
+    <value>585, 489</value>
   </data>
   <data name="DockPanelFileList.Text" xml:space="preserve">
     <value>Ergebnisse</value>
@@ -1194,6 +1209,24 @@
   <data name="&gt;&gt;BarButtonItem10.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;chkGridShowQuickfilter.Name" xml:space="preserve">
+    <value>chkGridShowQuickfilter</value>
+  </data>
+  <data name="&gt;&gt;chkGridShowQuickfilter.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;chkGridShowGrouping.Name" xml:space="preserve">
+    <value>chkGridShowGrouping</value>
+  </data>
+  <data name="&gt;&gt;chkGridShowGrouping.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;chkGridShowTitle.Name" xml:space="preserve">
+    <value>chkGridShowTitle</value>
+  </data>
+  <data name="&gt;&gt;chkGridShowTitle.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageCategoryFile.Name" xml:space="preserve">
     <value>RibbonPageCategoryFile</value>
   </data>
@@ -1236,6 +1269,12 @@
   <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroup8.Name" xml:space="preserve">
+    <value>RibbonPageGroup8</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup8.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -1254,6 +1293,18 @@
   <data name="&gt;&gt;RibbonPageGroup5.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageExport.Name" xml:space="preserve">
+    <value>RibbonPageExport</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageExport.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
+    <value>RibbonPageGroup2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
@@ -1272,16 +1323,10 @@
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageExport.Name" xml:space="preserve">
-    <value>RibbonPageExport</value>
+  <data name="&gt;&gt;RibbonPageGroup9.Name" xml:space="preserve">
+    <value>RibbonPageGroup9</value>
   </data>
-  <data name="&gt;&gt;RibbonPageExport.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
-    <value>RibbonPageGroup2</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonPageGroup9.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RepositoryItemTextEdit1.Name" xml:space="preserve">
diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb
index 3ec6ee72..df2d62a6 100644
--- a/GUIs.Common/frmDocumentResultList.vb
+++ b/GUIs.Common/frmDocumentResultList.vb
@@ -56,6 +56,7 @@ Public Class frmDocumentResultList
     Private ReadOnly Helpers As DocumentResultList.Helpers
     Private ReadOnly Params As DocumentResultList.Params
     Private ReadOnly LayoutManager As DocumentResultList.Layout
+
     Private WithEvents Watcher As DocumentResultList.Watcher
     Private ControlManager As AttributeControls
 
@@ -65,20 +66,21 @@ Public Class frmDocumentResultList
     Private Property ResultLists As List(Of DocumentResultList.DocumentResult)
 
     Private _IsLoading As Boolean = True
-    Private _ActiveGrid As GridControl = Nothing
-    Private _ActiveGridBand As GridBand = Nothing
     Private _DragBoxFromMouseDown As Rectangle
     Private _ScreenOffset As Point
     Private _CurrentDocument As DocumentResultList.Document = Nothing
     Private ReadOnly _FileOpenList As New Dictionary(Of Integer, String)
     Private ReadOnly _Language As String
 
+    Private Property _ActiveGrid As GridControl = Nothing
+    Private Property _ActiveGridBand As GridBand = Nothing
+    Private Property GridList As List(Of GridControl)
+    Private Property ViewList As List(Of BandedGridView)
+
     Private Property OperationMode As OperationMode Implements IResultForm.OperationMode
 
     Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm
 
-
-
     Public Event NeedsRefresh As EventHandler(Of Integer) Implements IResultForm.NeedsRefresh
     Public Event ResultsRefreshed As EventHandler(Of List(Of DocumentResultList.DocumentResult))
 
@@ -111,7 +113,7 @@ Public Class frmDocumentResultList
         GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
         FileEx = New Modules.Windows.File(pLogConfig)
         Watcher = New DocumentResultList.Watcher(pLogConfig)
-        LayoutManager = New DocumentResultList.Layout(pLogConfig, Config)
+        LayoutManager = New DocumentResultList.Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3})
 
         _Language = Utils.NotNull(Me.Environment.User.Language, State.UserState.LANG_EN_US)
     End Sub
@@ -199,6 +201,10 @@ Public Class frmDocumentResultList
 
             LayoutManager.DockManager_RestoreLayout(DockManager1)
 
+            chkGridShowQuickfilter.Checked = LayoutManager.GetFilterRowVisible()
+            chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible()
+            chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
+
         Catch ex As Exception
             ErrorHandler.ShowErrorMessage(ex, "Error while loading results", "Form Load")
 
@@ -953,4 +959,23 @@ Public Class frmDocumentResultList
             Logger.Error(ex)
         End Try
     End Sub
+
+
+    Private Sub chkGridShowGrouping_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowGrouping.CheckedChanged
+        If _IsLoading = False Then
+            LayoutManager.SetGroupPanelVisible(chkGridShowGrouping.Checked)
+        End If
+    End Sub
+
+    Private Sub chkGridShowQuickfilter_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowQuickfilter.CheckedChanged
+        If _IsLoading = False Then
+            LayoutManager.SetFilterRowVisible(chkGridShowQuickfilter.Checked)
+        End If
+    End Sub
+
+    Private Sub chkGridShowTitle_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowTitle.CheckedChanged
+        If _IsLoading = False Then
+            LayoutManager.SetBandTitleVisible(chkGridShowTitle.Checked)
+        End If
+    End Sub
 End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb
index fe58fd37..5b039398 100644
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -258,6 +258,7 @@ Public Class ClassInit
             Throw New InitException("Error in InitBasicData", ex)
         End Try
     End Sub
+
 #End Region
 
     Private Function SetupDatabase() As Boolean
diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb
index a4ba4f56..598b4f06 100644
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -47,12 +47,12 @@ Partial Class frmFlowForm
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.Bar3 = New DevExpress.XtraBars.Bar()
         Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem()
-        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItemGlobixGE = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.buttonExitZooflow = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnBasicConfig = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnGlobixConfig = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnServiceConfig = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnDatabaseConfig = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnRestartZooflow = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnExitZooflow = New DevExpress.XtraBars.BarButtonItem()
         Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
@@ -62,13 +62,12 @@ Partial Class frmFlowForm
         Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
         Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl()
+        Me.Panel3 = New System.Windows.Forms.Panel()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.PictureEdit2 = New DevExpress.XtraEditors.PictureEdit()
         Me.Panel2 = New System.Windows.Forms.Panel()
-        Me.PopupMenu1 = New DevExpress.XtraBars.PopupMenu(Me.components)
         Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components)
         Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge()
-        Me.Panel3 = New System.Windows.Forms.Panel()
         Me.ContextMenuSystray.SuspendLayout()
         CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -79,7 +78,6 @@ Partial Class frmFlowForm
         Me.Panel1.SuspendLayout()
         CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
-        CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -134,17 +132,14 @@ Partial Class frmFlowForm
         Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
         Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
         '
-        'TimerRefreshData
-        '
-        '
         'PictureBoxPM
         '
         Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.PictureBoxPM.Cursor = System.Windows.Forms.Cursors.Hand
         Me.PictureBoxPM.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
-        Me.PictureBoxPM.Location = New System.Drawing.Point(21, 22)
+        Me.PictureBoxPM.Location = New System.Drawing.Point(21, 6)
         Me.PictureBoxPM.Name = "PictureBoxPM"
-        Me.PictureBoxPM.Size = New System.Drawing.Size(158, 58)
+        Me.PictureBoxPM.Size = New System.Drawing.Size(158, 50)
         Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
         Me.PictureBoxPM.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Task_inaktiv
         Me.PictureBoxPM.TabIndex = 14
@@ -153,12 +148,13 @@ Partial Class frmFlowForm
         '
         'PictureBoxSearch
         '
-        Me.PictureBoxSearch.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.PictureBoxSearch.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand
         Me.PictureBoxSearch.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
-        Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 226)
+        Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 280)
         Me.PictureBoxSearch.Name = "PictureBoxSearch"
-        Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 49)
+        Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 50)
         Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
         Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv
         Me.PictureBoxSearch.TabIndex = 13
@@ -172,14 +168,13 @@ Partial Class frmFlowForm
         'pnlQuicksearch1
         '
         Me.pnlQuicksearch1.BackColor = System.Drawing.Color.White
-        Me.pnlQuicksearch1.Controls.Add(Me.Panel3)
         Me.pnlQuicksearch1.Controls.Add(Me.txtQuicksearch1)
         Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1)
         Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1)
         Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 333)
+        Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 335)
         Me.pnlQuicksearch1.Name = "pnlQuicksearch1"
-        Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 77)
+        Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 75)
         Me.pnlQuicksearch1.TabIndex = 16
         Me.pnlQuicksearch1.Visible = False
         '
@@ -187,26 +182,27 @@ Partial Class frmFlowForm
         '
         Me.txtQuicksearch1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.txtQuicksearch1.Location = New System.Drawing.Point(21, 40)
+        Me.txtQuicksearch1.Location = New System.Drawing.Point(21, 29)
         Me.txtQuicksearch1.Name = "txtQuicksearch1"
         Me.txtQuicksearch1.Properties.Appearance.BackColor = System.Drawing.Color.LightGray
         Me.txtQuicksearch1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txtQuicksearch1.Properties.Appearance.Options.UseBackColor = True
         Me.txtQuicksearch1.Properties.Appearance.Options.UseFont = True
         Me.txtQuicksearch1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
-        Me.txtQuicksearch1.Size = New System.Drawing.Size(135, 26)
+        Me.txtQuicksearch1.Properties.NullText = "Schnellsuche"
+        Me.txtQuicksearch1.Size = New System.Drawing.Size(124, 26)
         Me.txtQuicksearch1.TabIndex = 1
         '
         'PictureEditQuicksearch1
         '
         Me.PictureEditQuicksearch1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_Sidebar_individuelle_suche
-        Me.PictureEditQuicksearch1.Location = New System.Drawing.Point(138, 42)
+        Me.PictureEditQuicksearch1.Location = New System.Drawing.Point(151, 27)
         Me.PictureEditQuicksearch1.MenuManager = Me.BarManager1
         Me.PictureEditQuicksearch1.Name = "PictureEditQuicksearch1"
         Me.PictureEditQuicksearch1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
         Me.PictureEditQuicksearch1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
         Me.PictureEditQuicksearch1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom
-        Me.PictureEditQuicksearch1.Size = New System.Drawing.Size(64, 24)
+        Me.PictureEditQuicksearch1.Size = New System.Drawing.Size(28, 28)
         Me.PictureEditQuicksearch1.TabIndex = 17
         '
         'BarManager1
@@ -217,7 +213,7 @@ Partial Class frmFlowForm
         Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
         Me.BarManager1.DockControls.Add(Me.barDockControlRight)
         Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItemGlobixGE})
+        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnDatabaseConfig, Me.btnBasicConfig, Me.btnGlobixConfig})
         Me.BarManager1.MaxItemId = 11
         Me.BarManager1.StatusBar = Me.Bar3
         '
@@ -243,51 +239,51 @@ Partial Class frmFlowForm
         Me.BarSubItem1.Caption = "Menu"
         Me.BarSubItem1.Id = 0
         Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItemGlobixGE), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)})
+        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnDatabaseConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)})
         Me.BarSubItem1.Name = "BarSubItem1"
         Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
-        'BarButtonItem8
+        'btnBasicConfig
         '
-        Me.BarButtonItem8.Caption = "Grundeinstellungen"
-        Me.BarButtonItem8.Id = 9
-        Me.BarButtonItem8.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.properties
-        Me.BarButtonItem8.Name = "BarButtonItem8"
+        Me.btnBasicConfig.Caption = "Grundeinstellungen"
+        Me.btnBasicConfig.Id = 9
+        Me.btnBasicConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.properties
+        Me.btnBasicConfig.Name = "btnBasicConfig"
         '
-        'BarButtonItemGlobixGE
+        'btnGlobixConfig
         '
-        Me.BarButtonItemGlobixGE.Caption = "Grundeinstellungen Globix"
-        Me.BarButtonItemGlobixGE.Id = 10
-        Me.BarButtonItemGlobixGE.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemGlobixGE.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItemGlobixGE.Name = "BarButtonItemGlobixGE"
+        Me.btnGlobixConfig.Caption = "Grundeinstellungen Globix"
+        Me.btnGlobixConfig.Id = 10
+        Me.btnGlobixConfig.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemGlobixGE.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnGlobixConfig.Name = "btnGlobixConfig"
         '
-        'BarButtonItem6
+        'btnServiceConfig
         '
-        Me.BarButtonItem6.Caption = "Dienstkonfiguration"
-        Me.BarButtonItem6.Id = 7
-        Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.servermode
-        Me.BarButtonItem6.Name = "BarButtonItem6"
+        Me.btnServiceConfig.Caption = "Dienstkonfiguration"
+        Me.btnServiceConfig.Id = 7
+        Me.btnServiceConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.servermode
+        Me.btnServiceConfig.Name = "btnServiceConfig"
         '
-        'BarButtonItem7
+        'btnDatabaseConfig
         '
-        Me.BarButtonItem7.Caption = "Datenbankkonfiguration"
-        Me.BarButtonItem7.Id = 8
-        Me.BarButtonItem7.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource2
-        Me.BarButtonItem7.Name = "BarButtonItem7"
+        Me.btnDatabaseConfig.Caption = "Datenbankkonfiguration"
+        Me.btnDatabaseConfig.Id = 8
+        Me.btnDatabaseConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource2
+        Me.btnDatabaseConfig.Name = "btnDatabaseConfig"
         '
-        'BarButtonItem1
+        'btnRestartZooflow
         '
-        Me.BarButtonItem1.Caption = "Zooflow neustarten"
-        Me.BarButtonItem1.Id = 6
-        Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_refresh
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.btnRestartZooflow.Caption = "Zooflow neustarten"
+        Me.btnRestartZooflow.Id = 6
+        Me.btnRestartZooflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_refresh
+        Me.btnRestartZooflow.Name = "btnRestartZooflow"
         '
-        'buttonExitZooflow
+        'btnExitZooflow
         '
-        Me.buttonExitZooflow.Caption = "Zooflow beenden"
-        Me.buttonExitZooflow.Id = 1
-        Me.buttonExitZooflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.cancel
-        Me.buttonExitZooflow.Name = "buttonExitZooflow"
+        Me.btnExitZooflow.Caption = "Zooflow beenden"
+        Me.btnExitZooflow.Id = 1
+        Me.btnExitZooflow.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.cancel
+        Me.btnExitZooflow.Name = "btnExitZooflow"
         '
         'barDockControlTop
         '
@@ -353,12 +349,23 @@ Partial Class frmFlowForm
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.lblQuicksearch1.Appearance.Options.UseFont = True
-        Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 19)
+        Me.lblQuicksearch1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
+        Me.lblQuicksearch1.Location = New System.Drawing.Point(21, 3)
         Me.lblQuicksearch1.Name = "lblQuicksearch1"
-        Me.lblQuicksearch1.Size = New System.Drawing.Size(69, 15)
+        Me.lblQuicksearch1.Size = New System.Drawing.Size(158, 18)
         Me.lblQuicksearch1.TabIndex = 0
         Me.lblQuicksearch1.Text = "Schnellsuche"
         '
+        'Panel3
+        '
+        Me.Panel3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.Panel3.Location = New System.Drawing.Point(21, 272)
+        Me.Panel3.Name = "Panel3"
+        Me.Panel3.Size = New System.Drawing.Size(158, 2)
+        Me.Panel3.TabIndex = 17
+        '
         'Panel1
         '
         Me.Panel1.Controls.Add(Me.PictureEdit2)
@@ -384,6 +391,7 @@ Partial Class frmFlowForm
         'Panel2
         '
         Me.Panel2.Controls.Add(Me.PictureBoxPM)
+        Me.Panel2.Controls.Add(Me.Panel3)
         Me.Panel2.Controls.Add(Me.pnlQuicksearch1)
         Me.Panel2.Controls.Add(Me.PictureBoxSearch)
         Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill
@@ -392,11 +400,6 @@ Partial Class frmFlowForm
         Me.Panel2.Size = New System.Drawing.Size(202, 410)
         Me.Panel2.TabIndex = 17
         '
-        'PopupMenu1
-        '
-        Me.PopupMenu1.Manager = Me.BarManager1
-        Me.PopupMenu1.Name = "PopupMenu1"
-        '
         'AdornerUIManager1
         '
         Me.AdornerUIManager1.Elements.Add(Me.TaskBadge)
@@ -406,21 +409,13 @@ Partial Class frmFlowForm
         '
         Me.TaskBadge.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
         Me.TaskBadge.Appearance.Options.UseBackColor = True
-        Me.TaskBadge.Properties.Location = System.Drawing.ContentAlignment.TopRight
-        Me.TaskBadge.Properties.Offset = New System.Drawing.Point(-5, -5)
+        Me.TaskBadge.Properties.Location = System.Drawing.ContentAlignment.BottomRight
+        Me.TaskBadge.Properties.Offset = New System.Drawing.Point(0, 0)
         Me.TaskBadge.Properties.PaintStyle = DevExpress.Utils.VisualEffects.BadgePaintStyle.[Default]
         Me.TaskBadge.Properties.Text = "0"
         Me.TaskBadge.TargetElement = Me.PictureBoxPM
         Me.TaskBadge.TargetElementRegion = DevExpress.Utils.VisualEffects.TargetElementRegion.Control
         '
-        'Panel3
-        '
-        Me.Panel3.BackColor = System.Drawing.Color.Black
-        Me.Panel3.Location = New System.Drawing.Point(21, 3)
-        Me.Panel3.Name = "Panel3"
-        Me.Panel3.Size = New System.Drawing.Size(158, 10)
-        Me.Panel3.TabIndex = 17
-        '
         'frmFlowForm
         '
         Me.AllowDrop = True
@@ -448,14 +443,12 @@ Partial Class frmFlowForm
         CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlQuicksearch1.ResumeLayout(False)
-        Me.pnlQuicksearch1.PerformLayout()
         CType(Me.txtQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.PictureEditQuicksearch1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel2.ResumeLayout(False)
-        CType(Me.PopupMenu1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
@@ -478,11 +471,10 @@ Partial Class frmFlowForm
     Friend WithEvents txtQuicksearch1 As TextEdit
     Friend WithEvents lblQuicksearch1 As LabelControl
     Friend WithEvents Panel1 As Panel
-    Friend WithEvents PopupMenu1 As DevExpress.XtraBars.PopupMenu
     Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
     Friend WithEvents Bar3 As DevExpress.XtraBars.Bar
     Friend WithEvents BarSubItem1 As DevExpress.XtraBars.BarSubItem
-    Friend WithEvents buttonExitZooflow As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnExitZooflow As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl
     Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl
     Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl
@@ -491,12 +483,12 @@ Partial Class frmFlowForm
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnRestartZooflow As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnServiceConfig As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnDatabaseConfig As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnBasicConfig As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents Panel2 As Panel
-    Friend WithEvents BarButtonItemGlobixGE As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnGlobixConfig As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents AdornerUIManager1 As DevExpress.Utils.VisualEffects.AdornerUIManager
     Friend WithEvents TaskBadge As DevExpress.Utils.VisualEffects.Badge
     Friend WithEvents PictureEditQuicksearch1 As PictureEdit
diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx
index 3dadd9a3..b780cf16 100644
--- a/GUIs.ZooFlow/frmFlowForm.resx
+++ b/GUIs.ZooFlow/frmFlowForm.resx
@@ -1966,31 +1966,35 @@
     <value>716, 17</value>
   </metadata>
   <metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>990, 17</value>
+    <value>865, 17</value>
   </metadata>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="BarSubItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4DAAAC77u/
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMMEAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        IHZpZXdCb3g9IjAgMCAzMCAzMCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
         MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iUHJvcGVydGllcyI+DQogICAgPHBhdGggZD0iTTMwLDE4di00bC00LjQtMC43Yy0w
-        LjItMC44LTAuNS0xLjUtMC45LTIuMWwyLjYtMy42bC0yLjgtMi44bC0zLjYsMi42Yy0wLjctMC40LTEu
-        NC0wLjctMi4xLTAuOUwxOCwyaC00ICAgbC0wLjcsNC40Yy0wLjgsMC4yLTEuNSwwLjUtMi4xLDAuOUw3
-        LjUsNC43TDQuNyw3LjVsMi42LDMuNmMtMC40LDAuNy0wLjcsMS40LTAuOSwyLjFMMiwxNHY0bDQuNCww
-        LjdjMC4yLDAuOCwwLjUsMS41LDAuOSwyLjEgICBsLTIuNiwzLjZsMi44LDIuOGwzLjYtMi42YzAuNyww
-        LjQsMS40LDAuNywyLjEsMC45TDE0LDMwaDRsMC43LTQuNGMwLjgtMC4yLDEuNS0wLjUsMi4xLTAuOWwz
-        LjYsMi42bDIuOC0yLjhsLTIuNi0zLjYgICBjMC40LTAuNywwLjctMS40LDAuOS0yLjFMMzAsMTh6IE0x
-        NiwyMGMtMi4yLDAtNC0xLjgtNC00YzAtMi4yLDEuOC00LDQtNHM0LDEuOCw0LDRDMjAsMTguMiwxOC4y
-        LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+        Y2U9InByZXNlcnZlIiBpZD0iRWJlbmVfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzAgMzAiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtjbGlwLXBhdGg6dXJsKCNTVkdJ
+        RF8yXyk7ZmlsbDojQTUyNDMxO30KPC9zdHlsZT4NCiAgPGc+DQogICAgPGRlZnM+DQogICAgICA8cmVj
+        dCB4PSIwIiB5PSIwIiB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHJ4PSIwIiByeT0iMCIgaWQ9IlNWR0lE
+        XzFfIiAvPg0KICAgIDwvZGVmcz4NCiAgICA8Y2xpcFBhdGggaWQ9IlNWR0lEXzJfIj4NCiAgICAgIDx1
+        c2UgeGxpbms6aHJlZj0iI1NWR0lEXzFfIiBzdHlsZT0ib3ZlcmZsb3c6dmlzaWJsZSIgLz4NCiAgICA8
+        L2NsaXBQYXRoPg0KICAgIDxwYXRoIGQ9Ik0xMi4wOSwyMi4wMmMtMy44Ny0xLjYtNS43MS02LjA1LTQu
+        MTEtOS45MmMxLjYxLTMuODgsNi4wNS01LjcyLDkuOTItNC4xMWMzLjg4LDEuNiw1LjcyLDYuMDUsNC4x
+        MSw5LjkyICAgQzIwLjQxLDIxLjc4LDE1Ljk3LDIzLjYyLDEyLjA5LDIyLjAyIE0yLjUsMTIuOThjLTAu
+        MjIsMS4zNi0wLjIxLDIuNzIsMCw0LjA0TDAsMTguNDdsMS45NCw0LjY4bDIuOC0wLjc0ICAgYzAuNzgs
+        MS4wOSwxLjc0LDIuMDYsMi44NiwyLjg2bC0wLjc0LDIuOEwxMS41MywzMGwxLjQ1LTIuNWMxLjM2LDAu
+        MjIsMi43MiwwLjIxLDQuMDQsMGwxLjQ1LDIuNWw0LjY4LTEuOTRsLTAuNzUtMi44ICAgYzEuMDktMC43
+        OCwyLjA2LTEuNzQsMi44Ni0yLjg2bDIuOCwwLjc0TDMwLDE4LjQ3bC0yLjUtMS40NWMwLjIyLTEuMzYs
+        MC4yMS0yLjcyLDAtNC4wNEwzMCwxMS41M2wtMS45NC00LjY4bC0yLjgsMC43NSAgIGMtMC43OC0xLjA5
+        LTEuNzQtMi4wNi0yLjg2LTIuODZsMC43NS0yLjhMMTguNDcsMGwtMS40NSwyLjVjLTEuMzYtMC4yMi0y
+        LjcyLTAuMjEtNC4wNCwwTDExLjUzLDBMNi44NSwxLjk0bDAuNzUsMi44ICAgQzYuNTEsNS41Miw1LjU0
+        LDYuNDgsNC43Myw3LjU5bC0yLjgtMC43NUwwLDExLjUzTDIuNSwxMi45OHoiIGNsYXNzPSJzdDAiIC8+
+        DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
   <data name="BarButtonItemGlobixGE.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -2017,10 +2021,7 @@
         LDIwLDE2LDIweiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <metadata name="PopupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>865, 17</value>
-  </metadata>
   <metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1115, 17</value>
+    <value>990, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb
index 3aecb4ad..ddce3fe0 100644
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -150,7 +150,7 @@ Public Class frmFlowForm
         Me.Height = System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height - TaskBarHeight
     End Sub
 #End Region
-
+#Region "Form Variables"
     ' Constants
     Private Const OPACITY_INITIAL = 0
     Private Const OPACITY_FINAL = 1
@@ -195,6 +195,7 @@ Public Class frmFlowForm
     Public Event ClipboardChanged As EventHandler(Of IDataObject)
     Private WithEvents HotkeyClass As Hotkey
     Private WithEvents Watcher As Watcher = Watcher.Singleton
+#End Region
 
     Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load
         ' === Set Form ===
@@ -325,9 +326,9 @@ Public Class frmFlowForm
 
                 Init_Folderwatch()
                 Folderwatch_CheckFiles()
-                BarButtonItemGlobixGE.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                btnGlobixConfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
             Else
-                BarButtonItemGlobixGE.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                btnGlobixConfig.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             End If
 
 
@@ -1216,31 +1217,20 @@ Public Class frmFlowForm
             End Try
         End If
     End Function
-    Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Task Handles PictureBoxSearch.Click
-        If txtQuicksearch1.Text = String.Empty Then
-            Open_FlowSearch()
-            Return
 
-        Else
-            Await CheckRunSearch1()
-
-        End If
-
-    End Function
-
-    Private Sub buttonExitZooflow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonExitZooflow.ItemClick
+    Private Sub buttonExitZooflow_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExitZooflow.ItemClick
         ExitZooflow()
     End Sub
 
-    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnRestartZooflow.ItemClick
         Application.Restart()
     End Sub
 
-    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnServiceConfig.ItemClick
         frmServiceConfig.ShowDialog()
     End Sub
 
-    Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
+    Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDatabaseConfig.ItemClick
         Dim oForm As New frmSQLConfig(My.LogConfig) With {
             .ConnectionString = My.SystemConfig.ConnectionString,
             .FormTitle = "ECM Datenbank"
@@ -1253,15 +1243,25 @@ Public Class frmFlowForm
         End If
     End Sub
 
-    Private Async Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
+    Private Async Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnBasicConfig.ItemClick
         frmConfigBasic.ShowDialog()
         Await ConfigureQuicksearch1(True)
     End Sub
 
-    Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemGlobixGE.ItemClick
+    Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnGlobixConfig.ItemClick
         frmGlobixBasicConfig.ShowDialog()
     End Sub
 
+
+
+    Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter
+        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_aktiv
+    End Sub
+
+    Private Sub PictureBoxSearch_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseLeave
+        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_inaktiv
+    End Sub
+
     Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click
         Try
             Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager)
@@ -1273,14 +1273,6 @@ Public Class frmFlowForm
         End Try
     End Sub
 
-    Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter
-        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_aktiv
-    End Sub
-
-    Private Sub PictureBoxSearch_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseLeave
-        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_inaktiv
-    End Sub
-
     Private Sub PictureBoxPM_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseEnter
         PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_aktiv
     End Sub
@@ -1289,16 +1281,8 @@ Public Class frmFlowForm
         PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_inaktiv
     End Sub
 
-    Private Sub TimerRefreshData_Tick_1(sender As Object, e As EventArgs) Handles TimerRefreshData.Tick
-        TaskBadge.Properties.Text = Date.Now.Millisecond.ToString.Last
-    End Sub
-
     Private Async Sub PictureEditQuicksearch1_Click(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.Click
         Await CheckRunSearch1()
     End Sub
-
-    Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged
-
-    End Sub
 End Class