Equip menu functionality improved