diff --git a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs b/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs
index 051577a..cbedfbf 100644
--- a/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs
+++ b/DepartmentPortal/Common/DesktopTools/Models/WindowDesktopExtensionControlModel.cs
@@ -1,4 +1,5 @@
-using System;
+using DesktopTools.Controls;
+using System;
 
 namespace DesktopTools.Models
 {
@@ -10,6 +11,6 @@ namespace DesktopTools.Models
 
 		public string Title { get; set; }
 
-		public object Control { get; set; }
+		public ControlViewEntityList Control { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs
index 2a10eed..edbee17 100644
--- a/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs
+++ b/DepartmentPortal/DepartmentPortalDesctop/FormMain.cs
@@ -9,9 +9,9 @@ namespace DepartmentPortalDesctop
 {
 	public partial class FormMain : Form
 	{
-		private Dictionary<Guid, ControlViewEntityList> _baseControls;
+		private readonly Dictionary<Guid, ControlViewEntityList> _baseControls;
 
-		private Dictionary<Guid, ControlViewEntityList> _controls;
+		private readonly Dictionary<Guid, ControlViewEntityList> _controls;
 
 		public FormMain()
 		{
@@ -76,7 +76,7 @@ namespace DepartmentPortalDesctop
 				splitContainerMain.Panel1.Controls.Clear();
 				splitContainerMain.Panel1.Controls.Add(ctrl);
 				dataGridViewControls.Rows.Add(new object[] { ctrl.Id, ctrl.Title });
-				dataGridViewControls.Rows[dataGridViewControls.Rows.Count - 1].Selected = true;
+				dataGridViewControls.Rows[^1].Selected = true;
 			}
 		}