moved toolbar and modals to partials