Simple view refactor

Steps 1 and 4 of issue #17