Tidy up components. Fix bug in configuration component causing empty values to get initialised as an array.