Consolidate settings menus.
Adust display units menu item names.