Changed some of the main layout and colours