fixed modal + bug fixes
Merge branch 'master' of https://github.com/dbaclin/oinoi