Fixed layout and color issues.  Next up is partials