Further work on the Display of a question, views and viewmodel
fixed merge conflicts