Some UI and validation changes