Make buttons consistent colors; fix add button label