diff --git a/Moonlight/Features/Servers/Models/Forms/Admin/Servers/CreateServerForm.cs b/Moonlight/Features/Servers/Models/Forms/Admin/Servers/CreateServerForm.cs
index fe915a7..ea41171 100644
--- a/Moonlight/Features/Servers/Models/Forms/Admin/Servers/CreateServerForm.cs
+++ b/Moonlight/Features/Servers/Models/Forms/Admin/Servers/CreateServerForm.cs
@@ -12,29 +12,36 @@ public class CreateServerForm
     public string Name { get; set; }
     
     [Required(ErrorMessage = "You need to specify a server owner")]
-    [Selector(SelectorProp = "Username", DisplayProp = "Username")]
+    [Selector(SelectorProp = "Username", DisplayProp = "Username", UseDropdown = true)]
     public User Owner { get; set; }
     
     [Required(ErrorMessage = "You need to specify a server image")]
-    [Selector(SelectorProp = "Name", DisplayProp = "Name")]
+    [Selector(SelectorProp = "Name", DisplayProp = "Name", UseDropdown = true)]
     public ServerImage Image { get; set; }
     
     [Range(1, int.MaxValue, ErrorMessage = "Enter a valid cpu value")]
     [Description("The cores the server will be able to use. 100 = 1 Core")]
+    [Section("Resources")]
     public int Cpu { get; set; }
     
     [Range(1, int.MaxValue, ErrorMessage = "Enter a valid memory value")]
-    [Description("The amount of memory this server will be able to use in megabytes")]
+    [Description("The amount of memory this server will be able to use")]
+    [ByteSize(MinimumUnit = 1, Converter = 1, DefaultUnit = 2)]
+    [Section("Resources")]
     public int Memory { get; set; }
     
     [Range(1, int.MaxValue, ErrorMessage = "Enter a valid disk value")]
-    [Description("The amount of disk space this server will be able to use in megabytes")]
+    [Description("The amount of disk space this server will be able to use")]
+    [ByteSize(MinimumUnit = 1, Converter = 1, DefaultUnit = 2)]
+    [Section("Resources")]
     public int Disk { get; set; }
     
     [Description("Whether to use a virtual disk for storing server files. Dont use this if you want to overallocate as the virtual disks will fill out the space you allocate")]
+    [Section("Deployment")]
     public bool UseVirtualDisk { get; set; }
     
     [Required(ErrorMessage = "You need to specify a server node")]
-    [Selector(SelectorProp = "Name", DisplayProp = "Name")]
+    [Selector(SelectorProp = "Name", DisplayProp = "Name", UseDropdown = true)]
+    [Section("Deployment")]
     public ServerNode Node { get; set; }
 }
\ No newline at end of file