More work with the show/hide UI