Small changes to views & validations