changed order so that inventory is next to shop. Testers want them next together because they're associated