small changes to CreateBuildingWindow