Cleaned up and corrected errors Categories views and viewmodels