Combine redundant views/classes
CM StorageVolume fix

Still need to fix fallback for non-CM devices
Storage Fallback fixes