Fixed shift clicking in containers

- Code cleanup