merge fixes and better modal plus other small things
Merge pull request #36 from galitskyd/merge-fixes

merge fixes and better modal plus other small things