Reorganized most toolbar functionality