Toolbar and Menu fixes