Splitting up the toolbar code so it's more configurable