--fix timeout and change UI desig fot the map and building information--