First pass at implementing Eoin's restyling