And even more work on the monolithic MainForm.cs