Shelves can be removed, some fixes, got problems adding items