Updates before item popups rework
Updates after item popups rework