Several improvements on UI and validation