Add Topic Video

Video Topic and some fix some bugs