further tweaks to colours and form layout
refactoring how/where fields get their classes added