Drops 'DNA' from display names and adds units where appropriate, closes #15