Reformat some of the stuff in the MainForm
Rename some controls on the MainForm