modal + fixes
Merge pull request #5 from c2is/modal

modal + fixes