Visibility Rules & fixes