Finally fixed button colors and borders