Reorganize toolbar buttons