Sadly no modal but few improvments
Merge pull request #2 from laedit/Modal-Windows

Sadly no modal but few improvements