Adding new flow for question for video, and some refactoring on the initial naming for simplicity
Resolving merge conflicts