Add colors, update buttons design