Fixed visibility of some classes to match parent visibility