Changed colours, fixed button labels and some text