Formrefactor

Updated lots of stuff - mainly around refactoring form to use form sets.