diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini
index 6a0b408..93df7d2 100644
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@@ -35,7 +35,10 @@ bLoadWidgetsOnDedicatedServer=True
 
 [/Script/Engine.Engine]
 NearClipPlane=0.010000
-MaximumLoopIterationCount=100000000
+MaximumLoopIterationCount=999999999
+
+[/Script/Engine.RecastNavMesh]
+bFixedTilePoolSize=False
 
 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000
@@ -78,3 +81,4 @@ AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
 PhysXTreeRebuildRate=10
 
+
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
index 7b06304..01e7c08 100644
--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
@@ -63,6 +63,8 @@ DefaultViewportMouseLockMode=LockAlways
 +ActionMappings=(ActionName="SpeedDown",Key=Subtract,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="SwapRoles",Key=Tab,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +ActionMappings=(ActionName="SwitchCamera",Key=C,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
++ActionMappings=(ActionName="NextBuilding",Key=PageDown,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
++ActionMappings=(ActionName="PreviousBuilding",Key=PageUp,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
 +AxisMappings=(AxisName="LeftRight",Key=Right,Scale=1.000000)
 +AxisMappings=(AxisName="LeftRight",Key=Left,Scale=-1.000000)
 +AxisMappings=(AxisName="DownUp",Key=Up,Scale=1.000000)
diff --git a/Content/BPs/Birdview.uasset b/Content/BPs/Birdview.uasset
index 7d5838d..91e2e47 100644
Binary files a/Content/BPs/Birdview.uasset and b/Content/BPs/Birdview.uasset differ
diff --git a/Content/BPs/GI.uasset b/Content/BPs/GI.uasset
index e29a73a..df5b55b 100644
Binary files a/Content/BPs/GI.uasset and b/Content/BPs/GI.uasset differ
diff --git a/Content/BPs/GameSettings.uasset b/Content/BPs/GameSettings.uasset
index 304e3cb..3f412d7 100644
Binary files a/Content/BPs/GameSettings.uasset and b/Content/BPs/GameSettings.uasset differ
diff --git a/Content/BPs/MapMarkers.uasset b/Content/BPs/MapMarkers.uasset
index 201500f..c5b980a 100644
Binary files a/Content/BPs/MapMarkers.uasset and b/Content/BPs/MapMarkers.uasset differ
diff --git a/Content/BPs/PC.uasset b/Content/BPs/PC.uasset
index c78badd..1713f43 100644
Binary files a/Content/BPs/PC.uasset and b/Content/BPs/PC.uasset differ
diff --git a/Content/BPs/StreetMap_Static.uasset b/Content/BPs/StreetMap_Static.uasset
index 03b013e..3d6fca7 100644
Binary files a/Content/BPs/StreetMap_Static.uasset and b/Content/BPs/StreetMap_Static.uasset differ
diff --git a/Content/UI/CharGen.uasset b/Content/UI/CharGen.uasset
index 903a6ba..a2fb508 100644
Binary files a/Content/UI/CharGen.uasset and b/Content/UI/CharGen.uasset differ
diff --git a/Content/UI/CityMenu.uasset b/Content/UI/CityMenu.uasset
index 7030477..f73e1b0 100644
Binary files a/Content/UI/CityMenu.uasset and b/Content/UI/CityMenu.uasset differ
diff --git a/Content/UI/Cursor.uasset b/Content/UI/Cursor.uasset
index 6fdaaa7..1b19d13 100644
Binary files a/Content/UI/Cursor.uasset and b/Content/UI/Cursor.uasset differ
diff --git a/Content/UI/MainMenu.uasset b/Content/UI/MainMenu.uasset
index 836e38e..26fa76d 100644
Binary files a/Content/UI/MainMenu.uasset and b/Content/UI/MainMenu.uasset differ
diff --git a/Content/UI/Marker.uasset b/Content/UI/Marker.uasset
index e15371a..1abcca9 100644
Binary files a/Content/UI/Marker.uasset and b/Content/UI/Marker.uasset differ
diff --git a/Content/UI/SettingCheckbox.uasset b/Content/UI/SettingCheckbox.uasset
index 791c183..5215a0e 100644
Binary files a/Content/UI/SettingCheckbox.uasset and b/Content/UI/SettingCheckbox.uasset differ
diff --git a/Content/UI/TopRight.uasset b/Content/UI/TopRight.uasset
index 6f8d451..5a13f93 100644
Binary files a/Content/UI/TopRight.uasset and b/Content/UI/TopRight.uasset differ
diff --git a/Content/UI/Tutorial.uasset b/Content/UI/Tutorial.uasset
new file mode 100644
index 0000000..cc94cfb
Binary files /dev/null and b/Content/UI/Tutorial.uasset differ
diff --git a/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h b/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h
index 24aa7b3..c89f500 100644
--- a/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h
+++ b/Plugins/StreetMap/Source/StreetMapRuntime/Public/StreetMap.h
@@ -462,7 +462,7 @@ public:
     
     /** Vinfamy added */
 	UFUNCTION(BlueprintCallable)
-	FStreetMapBuilding FindBuilding(const FVector2D Point);
+	TArray<FStreetMapBuilding> FindBuilding(const FVector2D Point);
     
     UFUNCTION(BlueprintCallable)
 	FStreetMapRoad FindRoad(const FVector2D Point);
diff --git a/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp b/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp
index 35286ad..a998c3a 100644
--- a/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp
+++ b/Plugins/StreetMap/Source/StreetMapRuntime/StreetMap.cpp
@@ -33,17 +33,17 @@ void UStreetMap::GetAssetRegistryTags( TArray<FAssetRegistryTag>& OutTags ) cons
 }
 
 
-FStreetMapBuilding UStreetMap::FindBuilding(const FVector2D Point)
+TArray<FStreetMapBuilding> UStreetMap::FindBuilding(const FVector2D Point)
 {
-    FStreetMapBuilding emptyBuilding;
+    TArray<FStreetMapBuilding> FoundBuildings;
     for (const auto &element : Buildings)
     {
         if (FPolygonTools::IsPointInsidePolygon(element.BuildingPoints, Point))
         {
-            return element;
+            FoundBuildings.Add(element);
         }
     }
-    return emptyBuilding;
+    return FoundBuildings;
 }
 
 FStreetMapRoad UStreetMap::FindRoad(const FVector2D Point)
@@ -51,7 +51,7 @@ FStreetMapRoad UStreetMap::FindRoad(const FVector2D Point)
     FStreetMapRoad emptyRoad;
     for (const auto &element : Roads)
     {
-        if (FPolygonTools::IsPointInsidePolygon(element.RoadPoints, Point))
+        if (FPolygonTools::IsPointInsidePolygon(element.RoadPoints, Point) && element.RoadName.Len() > 0)
         {
             return element;
         }