Minor view refactoring