Better management of toolbar buttons