refactored out the toolbar