Changes to mainForm