Added changes for new Toolbar navigation