restructure toolbar