Lots of refactoring to better support multiple views