Added the ability to toggle containers