Refactored ViewStory