Refactored views to break things out a bit and restore my sanity