Modified Login and Done UI changes