Fix modal and dialog