Tidied up styles

and removed some redundant code from the forms module