removed toolbar dependency (toolbarwrapper handles this)