refactor all views