Added ability to add buttons to Form class
Improved the Form classes