Added width/height checking code (originally in Player ViewModel, but currently commented out there.)