Clean up some issues with the show/hide. Refactor the show/hide event.