Fixed the global visibility controls and independent 2D / 3D visibility