Added loading from service.
Refactored part of the code to new questionaire structure.
New format can now be displayed