Added Directives.  Form Cleanup and Validation