Spruced up views, prepared for models now