updates to building_create, attempt at relayering map2 on nav-back
Merge branch 'eddie'