started fixing visibility
more changes to visibility