Max & Andy - Tidy up forms and correct validation.