Exit function fixed & UI changes & save function fixed