Fixed some popup stuff (so building info is sorta displayed again)
Merge remote-tracking branch 'origin/master'
Fixed some popup stuff (so building info is sorta displayed again)