The add to / remove from container behavior needs to be modified. I have frequently had the application completely rearrange my workflow because of it. I was just deleting a handful of closed containers when the application removed all my tools from their individual containers and wrapped everything in one big container completely screwing up my entire workflow. This happens a lot. Now I have to reorganize the workflow. This is one of my biggest frustrations with the application.