Cleaned up ViewModels to make as few db calls as possible