UI and validation fixes