changed button color to blue
changed one more button to blue
fixed default bootstrap back to gray
fixing merge conflict