Add color to buttons and clean-up