Clean up some overzealous use of <br>s, bring styling more inline with
mocks and fix swatch bug