rename some popups
fix async issue with expense line items