Added remove item functionality
Fix issue on overlapping items