Added hiding of controls