Improved UI swap based on item type.