Changes in GUI to make "new building" work
Merge origin/master
Merge origin/master