Rearranges some view logic.
Merge pull request #104 from WGBH/rearrange-some-view-logic

Rearranges some view logic.