fixing modals
Merge pull request #28 from afalsario/afalsario

fixing modals
Conflicts resolved