First commit
Fixed merge conflicts
Video expanding and covered with opacity and recording