Refactor and adding some videos