Adding form validation and ue enhancements