Changed modals so they match and clear properly