Update to colours and layout