toolbar helper refactor