Changed the layout and colours