refactoring all views