views additions and refactoring