refactor(view) set correct order