Move conditional visibility to class level instead of setting