some view refactoring