diff --git a/DDMonorepo.sln b/DDMonorepo.sln
index 5de0393a..58afbfdf 100644
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -63,8 +63,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMService", "SERVICES\DD
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIFileOps", "EDMI_FILE_OPs\EDMIFileOps.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientSuiteTest", "DXApplication1\ClientSuiteTest\ClientSuiteTest.csproj", "{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}"
@@ -159,10 +157,6 @@ Global
 		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU
-		{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{221FDADA-D849-4036-A7CE-D1FC1D67E1FA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -197,7 +191,6 @@ Global
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
-		{221FDADA-D849-4036-A7CE-D1FC1D67E1FA} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 	EndGlobalSection
diff --git a/EDMI_ClientSuite/ClassErrorHandler.vb b/EDMI_ClientSuite/ClassErrorHandler.vb
index 24110a1d..8f26dbcd 100644
--- a/EDMI_ClientSuite/ClassErrorHandler.vb
+++ b/EDMI_ClientSuite/ClassErrorHandler.vb
@@ -15,13 +15,13 @@ Public Class ClassErrorHandler
 
         oMessage &= $"Form: {oFormName}{vbNewLine}"
         oMessage &= $"Method: {oMethodName}{vbNewLine}"
-        oMessage &= $"{Exception.Message}{vbNewLine}{Exception.StackTrace}{vbNewLine}{vbNewLine}"
+        oMessage &= $"{Exception.Message}{vbNewLine}"
+        oMessage &= $"{Exception.StackTrace}{vbNewLine}{vbNewLine}"
         oMessage &= $"Please report this error to error@digitaldata.works"
 
         Return oMessage
     End Function
 
-
     Public Sub ShowErrorMessage(Exception As Exception)
         _Logger.Error(Exception)
         MsgBox(GetMessage(Exception), MsgBoxStyle.Critical, "Unexpected Error")
diff --git a/EDMI_ClientSuite/ClassUIConfig.vb b/EDMI_ClientSuite/ClassUIConfig.vb
index 040f4df8..32606537 100644
--- a/EDMI_ClientSuite/ClassUIConfig.vb
+++ b/EDMI_ClientSuite/ClassUIConfig.vb
@@ -3,7 +3,6 @@
 Public Class ClassUIConfig
     Public Property SkinName As String = "Office 2016 Colorful"
 
-    'Public Property EditFormConfigs As New List(Of KeyValuePair(Of String, EditFormConfig))
     Public Property EditFormConfigs As New List(Of EditFormConfig)
 
     Public Class EditFormConfig
diff --git a/EDMI_ClientSuite/FormDefaults/BaseForm.vb b/EDMI_ClientSuite/FormDefaults/BaseForm.vb
index f91606af..b40c8eb1 100644
--- a/EDMI_ClientSuite/FormDefaults/BaseForm.vb
+++ b/EDMI_ClientSuite/FormDefaults/BaseForm.vb
@@ -18,11 +18,16 @@ Public Class BaseForm
     Protected ReadOnly _ErrorHandler As ClassErrorHandler
 
     Public Sub New()
-        Dim oClassName = [GetType]().Name
+        ' 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
-        ' so we need to check with ?
+        ' 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
 End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb b/EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb
index 87b84127..46c412ac 100644
--- a/EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb
+++ b/EDMI_ClientSuite/FormDefaults/BaseRibbonForm.vb
@@ -18,12 +18,17 @@ Public Class BaseRibbonForm
     Protected ReadOnly _ErrorHandler As ClassErrorHandler
 
     Public Sub New()
-        Dim oClassName = [GetType]().Name
+        ' 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
-        ' so we need to check with ?
+        ' 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
 End Class