Merge pull request #1 from vikinghug/master

Upstream update
Popup only drawing the windows it need to show
bugfixes mountbutton & changed tooltip at cursor command
Merge pull request #2 from vikinghug/master

Upstream update
Merge pull request #29 from Crowdedlight/master

Bugfixes and changed command