Refactor views, remove layout