Visibility labels support
Corrections to Visibility along with testcases