Some minor improvements on the button show/hide functionality