Simplify visibilities controller