Change ordering to match top menu + clarify abbreviation