Add colors and improve form layout
Add colors and improve form layout

Mostly affects the add/remove page, but they all benefit from the header update

eallrich/checkniner,eallrich/checkniner,eallrich/checkniner