Fix #93
Fix #92
Fix #97
Fix #83
Fix #74
Fix #99
correction modal js
Merge