Minor changes to MainForm and controllers