Moved modals into partials