changed colours and fixed 'cancel' bug