Cosmetic fixes in modals