Add colors for new styles of buttons
Fix grid issues