consolidated toolbars into topbar for ease of testing