attempt to get item panel working, uncomplete
Fixed merge conflict with ItemPanel