Refactor to individual views