Reorganize MainForm a bit