reorganized setup and inventory pages