Refactor toolbar creation code for eventual user customizability