View changes and refactor