Reworked the show/hide system