Attempt to fix hiding issues

There was an issue with not everything hiding when it was supposed to. This
attempts to fix that problem.