Refactored videos and views