More validations and UI fixes