Add logic to fall back to a default view class
Remove luminous media
Remove some unused lines