Fixed the toolbar helper
Partial fixes for the "project" module