improved questions and options models
Improved behavior of main models of application