Started to refactor views.