Further pass at implementing Eoin's restyling