Composer control UI tidy up & related refactoring.