Improved show/hide buttons