colored the buttons
fixed merge conflicts