fixed three modals
Merge branch 'feature/118-modals' into develop