Fixed the mess of items