Moved modals above all content (#2154)