Improve handling of hidding/showing buttons