Simplified visibility system

Removed separate visibility list to just use main list plus separator