changed colours, fix menu swipe issue