OnExit problem resolved, UI looks a lot smoother