latest working version
fixup issues with toolbar