Updated WinForms layout