Added building detail view
Locations are now more broadly defined
Refactored some code to make it better functioning