Tweaked the visibility settings further to achieve a more consistent behaviour