better naming of private helper classes
toolbar helper support
small fix for toolbar helper