Made ui more foolproof