Improved forms and error styling
Revert colour changes