make collapsible & modify tbar order