More view clean up / refactoring