Added a number of new Form Extension methods and refactored some files