Removed +View categories and merged into view model