Ui Fix and minor changes in FrmMain code