Added visibility control for the shapes.