Minor view package refactoring