diff --git a/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb b/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb
index d1ee4b1f..113a5846 100644
--- a/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb
+++ b/GUIs.ZooFlow/frmAdministrationZooFlow.Designer.vb
@@ -32,8 +32,8 @@ Partial Class frmAdministrationZooFlow
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
         Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
+        Me.XtraTabPageEntities = New DevExpress.XtraTab.XtraTabPage()
+        Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage()
         Me.TreeList1 = New DevExpress.XtraTreeList.TreeList()
         Me.TreeListColumn1 = New DevExpress.XtraTreeList.Columns.TreeListColumn()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
@@ -98,22 +98,22 @@ Partial Class frmAdministrationZooFlow
         Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
         Me.XtraTabControl1.Location = New System.Drawing.Point(175, 159)
         Me.XtraTabControl1.Name = "XtraTabControl1"
-        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1
+        Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageEntities
         Me.XtraTabControl1.Size = New System.Drawing.Size(625, 269)
         Me.XtraTabControl1.TabIndex = 5
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
+        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageEntities, Me.XtraTabPageAttributes})
         '
-        'XtraTabPage1
+        'XtraTabPageEntities
         '
-        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(623, 246)
-        Me.XtraTabPage1.Text = "Business Entities"
+        Me.XtraTabPageEntities.Name = "XtraTabPageEntities"
+        Me.XtraTabPageEntities.Size = New System.Drawing.Size(623, 246)
+        Me.XtraTabPageEntities.Text = "Business Entities"
         '
-        'XtraTabPage2
+        'XtraTabPageAttributes
         '
-        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(333, 144)
-        Me.XtraTabPage2.Text = "XtraTabPage2"
+        Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes"
+        Me.XtraTabPageAttributes.Size = New System.Drawing.Size(623, 246)
+        Me.XtraTabPageAttributes.Text = "Attributes"
         '
         'TreeList1
         '
@@ -166,10 +166,11 @@ Partial Class frmAdministrationZooFlow
         Me.Controls.Add(Me.TreeList1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdministrationZooFlow.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.Name = "frmAdministrationZooFlow"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
-        Me.Text = "frmAdministrationZooFlow"
+        Me.Text = "Administration"
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl1.ResumeLayout(False)
@@ -189,8 +190,8 @@ Partial Class frmAdministrationZooFlow
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents ImageList1 As ImageList
     Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl
-    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents XtraTabPageEntities As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage
     Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList
     Friend WithEvents TreeListColumn1 As DevExpress.XtraTreeList.Columns.TreeListColumn
     Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
diff --git a/GUIs.ZooFlow/frmAdministrationZooFlow.resx b/GUIs.ZooFlow/frmAdministrationZooFlow.resx
index caf8630b..e1414131 100644
--- a/GUIs.ZooFlow/frmAdministrationZooFlow.resx
+++ b/GUIs.ZooFlow/frmAdministrationZooFlow.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC8
-        CQAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAwEAAUABAAFAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -172,6 +172,9 @@
   <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>127, 17</value>
   </metadata>
+  <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>127, 17</value>
+  </metadata>
   <metadata name="DpiAwareImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>293, 17</value>
   </metadata>
@@ -181,6 +184,30 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxOS4yLCBWZXJzaW9uPTE5LjIu
         My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAADBE
         ZXZFeHByZXNzLlV0aWxzLkRQSUF3YXJlSW1hZ2VDb2xsZWN0aW9uU3RyZWFtZXIAAAAAAgAAAAs=
+</value>
+  </data>
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="frmAdministrationZooFlow.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALoDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iUGFnZVNldHVwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwyNkg4VjZoMTB2NWMwLDAu
+        NiwwLjQsMSwxLDFoNXY5LjJsMiwyVjExbC03LTdIN0M2LjQsNCw2LDQuNCw2LDV2MjJjMCwwLjYsMC40
+        LDEsMSwxaDE0LjJMMTkuMiwyNnoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMjcuNiwy
+        Ny42bC02LjItNi4yYzAuNC0wLjcsMC42LTEuNSwwLjYtMi40YzAtMi44LTIuMi01LTUtNWMtMC44LDAt
+        MS41LDAuMi0yLjEsMC41bDIuNywyLjcgICBjMC42LDAuNiwwLjYsMS43LDAsMi40cy0xLjcsMC42LTIu
+        NCwwbC0yLjctMi43QzEyLjIsMTcuNSwxMiwxOC4yLDEyLDE5YzAsMi44LDIuMiw1LDUsNWMwLjksMCwx
+        LjctMC4yLDIuNC0wLjZsNi4yLDYuMiAgIGMwLjYsMC42LDEuNCwwLjYsMiwwbDAsMEMyOC4xLDI5LDI4
+        LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
 </root>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/frmAdministrationZooFlow.vb b/GUIs.ZooFlow/frmAdministrationZooFlow.vb
index 342785e7..942de35e 100644
--- a/GUIs.ZooFlow/frmAdministrationZooFlow.vb
+++ b/GUIs.ZooFlow/frmAdministrationZooFlow.vb
@@ -1,15 +1,17 @@
 Public Class frmAdministrationZooFlow
-    Private _TABIndex As Integer
+    Private Sub frmAdministrationZooFlow_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
-    Sub DisplayTabs()
+    End Sub
+
+    Sub DisplayTab(PageToDisplay As DevExpress.XtraTab.XtraTabPage)
         Try
-            Dim oindex = 0
-            For Each otab As DevExpress.XtraTab.IXtraTabPage In XtraTabControl1.TabPages
-                XtraTabControl1.TabPages(oindex).PageVisible = False
-                If oindex = _TABIndex Then
-                    XtraTabControl1.TabPages(oindex).PageVisible = True
+
+            For Each oPage As DevExpress.XtraTab.XtraTabPage In XtraTabControl1.TabPages
+                If oPage.Name = PageToDisplay.Name Then
+                    oPage.PageVisible = True
+                Else
+                    oPage.PageVisible = False
                 End If
-                oindex += 1
             Next
         Catch ex As Exception
 
@@ -23,11 +25,11 @@
 
         Select Case e.Node.Tag.ToString
             Case "IDB_ATTRIBUTES"
-                _TABIndex = 0
+                DisplayTab(XtraTabPageAttributes)
             Case "IDB_ENTITIES"
-                _TABIndex = 1
+                DisplayTab(XtraTabPageEntities)
         End Select
-
-        DisplayTabs()
     End Sub
+
+
 End Class
\ No newline at end of file