Merge "Refactor the toolbar to fit new directory design"