Rebrand touchup

Corrects several missed colors and layout bugs. This is the last piece of the FEATURE-rebrand branch.

MJ-579.

All tests pass.