Change button colors and clean up indentation