Improved unit sorting and display

Units now sort in ascending order, and redundant prefixes have been removed from unit labels for cleaner display.