Make hiding of controls for single page opt in