switched to self contained toolbar