Improvements to UI and Validation