Work on visibility settings