change view and refactoring