Added the ability to add/remove controls