Modals update
Merge branch 'modals'