Minor: Small UI change based on feedback. Add units to some fields.