Aiken import - additional UI improvements - refs BT#7074