Little bit of improvements in MainForm