More validation and UI fixes