Updated inventory and base slot selection logic