Change button colors
Make Add X button less prominent. Move to panel headers