Refactor views and start creating navigation