Some cleaning and work on CompositionWidget