Toolbar and menu now call the same functions.