Main and add screens now use the correct units; info screens still need to be updated.