Fixed hide show bugs