Changed colors and converted buttons to primary