Cleaning up markup and adding in videos