Craig Jamieson - Design centrally for consistency

Design centrally for consistency