Added visibility controls