Refactor views some more