Changed the button layout and colours