refactored AddItem, TopNavBar