Updates to new view file structure; Closes #1154