Improved Form Field and Validation