View refactoring and polishing