View refactoring and fix an errant color set.