Small changes to MainForm