shifted items into inventory hierarchy and fixed topbar links