Updated button color and click handlers