diff --git a/WotBlitzStatisticsPro.Blazor/Constants.cs b/WotBlitzStatisticsPro.Blazor/Constants.cs
index 2fadd31..01b0d39 100644
--- a/WotBlitzStatisticsPro.Blazor/Constants.cs
+++ b/WotBlitzStatisticsPro.Blazor/Constants.cs
@@ -1,6 +1,8 @@
-namespace WotBlitzStatisticsPro.Blazor
+using WotBlitzStatisticsPro.Blazor.Model;
+
+namespace WotBlitzStatisticsPro.Blazor
 {
-    public class Constants
+    public static class Constants
     {
         public const string ClanTagColor = "#d4d481";
 
@@ -41,5 +43,10 @@
 
 
         public const string LoginInfoLocalStorageKey = "login_info";
+
+        public static TankTreeRowMap[] TanksTreeHelper = new TankTreeRowMap[]
+        {
+            new TankTreeRowMap(2065,2)
+        };
     }
 }
\ No newline at end of file
diff --git a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs
index 1da9e96..43b6345 100644
--- a/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs
+++ b/WotBlitzStatisticsPro.Blazor/Pages/PlayerInfoTanksTreeBase.cs
@@ -82,20 +82,28 @@ namespace WotBlitzStatisticsPro.Blazor.Pages
             for (int tier = 1; tier < 11; tier++)
             {
                 var vehiclesByTier = vehiclesTree.Where(v => v.Tier == tier).ToList();
-                int row = 0;
-                // TODO: Order
                 foreach (var vehicleFromDictionary in vehiclesByTier)
                 {
-                    // Find previous map to figure out the row
-                    int currentRow = FindRowFromPreviousTierMapping(vehicleFromDictionary, row);
+                    int currentRow = 0;
+                    if (tier == 1)
+                    {
+                        var rowMap = Constants.TanksTreeHelper.FirstOrDefault(v => v.TankId == vehicleFromDictionary.TankId);
+                        if(rowMap != null)
+                        {
+                            currentRow = rowMap.Row;
+                        }
+                    }
+                    else
+                    {
+                        currentRow = FindRowFromPreviousTierMapping(vehicleFromDictionary);
+                    }
 
                     var treeItem = BuildNonPremTreeItem(vehicleFromDictionary, currentRow);
-                    
+
                     // Map next tier tanks by rows
                     treeItem.NextRows = BuildNextTanksRowMapping(vehicleFromDictionary, currentRow);
                     
                     TreeItems.Add(treeItem);
-                    row++;
                 }
             }
 
@@ -154,29 +162,25 @@ namespace WotBlitzStatisticsPro.Blazor.Pages
                 }
                 else
                 {
-                    // If more than one, sort them AT first, Heavy, Middle and light
-                    int nextRow = currentRow;
-                    string[] tankTypes = { "AT-SPG", "heavyTank", "mediumTank", "lightTank" };
-                    var nextTanksTypes = VehiclesLibrary
-                        .Where(v => vehicleFromDictionary.NexTanksInTree.Contains(v.TankId))
-                        .Select(v => new { v.TankId, TankType = v.TypeId })
-                        .ToList();
-                    foreach (var tankType in tankTypes)
+                    foreach (var nextTankInTree in vehicleFromDictionary.NexTanksInTree)
                     {
-                        foreach (var nextTierTank in nextTanksTypes.Where(t => t.TankType == tankType))
+                        // If more than one, get tank row from special mappings array
+                        var rowMap = Constants.TanksTreeHelper.FirstOrDefault(v => v.TankId == nextTankInTree);
+                        if (rowMap != null)
                         {
-                            nextRowsMap.Add(new TankTreeRowMap(nextTierTank.TankId, nextRow));
-                            nextRow++;
+                            nextRowsMap.Add(rowMap);
                         }
                     }
+
                 }
             }
 
             return nextRowsMap;
         }
 
-        private int FindRowFromPreviousTierMapping(IDictionary_Vehicles vehicleFromDictionary, int currentRow)
+        private int FindRowFromPreviousTierMapping(IDictionary_Vehicles vehicleFromDictionary)
         {
+            int currentRow = 0;
             var previousTierTanks = TreeItems.Where(t => t.Tier == vehicleFromDictionary.Tier - 1).ToList();
             foreach (var previousTierTank in previousTierTanks)
             {