MainForm refinement