Updated button color layout