Removing unwanted spaces
Fixing adapt_to_survey
Some cleaning and work on CompositionWidget