Fixed popups when adding new items, fixed final screen