modals structure fix