updated composer, changed to my branch of toolbar and changed toolbar on template

Global nav now needs to be in id navWrapper