Sorted out the colour issue for the button
Fixed conflicts