diff --git a/obj/Debug/net5.0-windows/TournamentManager.dll b/obj/Debug/net5.0-windows/TournamentManager.dll
index 6f2e7ea04114681f6c484e26bd9ee857a8935216..513211d477b05fd7d7935f6e68d867d5c9833c9d 100644
Binary files a/obj/Debug/net5.0-windows/TournamentManager.dll and b/obj/Debug/net5.0-windows/TournamentManager.dll differ
diff --git a/obj/Debug/net5.0-windows/TournamentManager.pdb b/obj/Debug/net5.0-windows/TournamentManager.pdb
index 4fdd009cb254323a4be9c0d595a2999cc8946f1c..3718a08aacd85fc4ec5c661428cd3a0b94b7fabc 100644
Binary files a/obj/Debug/net5.0-windows/TournamentManager.pdb and b/obj/Debug/net5.0-windows/TournamentManager.pdb differ
diff --git a/obj/Debug/net5.0-windows/ref/TournamentManager.dll b/obj/Debug/net5.0-windows/ref/TournamentManager.dll
index f000f0cdf3bd0f08d98f3b1120648e6c45d7ecb9..9d23fe7715471eaeaa998cc797350f152a8eb0f7 100644
Binary files a/obj/Debug/net5.0-windows/ref/TournamentManager.dll and b/obj/Debug/net5.0-windows/ref/TournamentManager.dll differ
diff --git a/src/Group.cs b/src/Group.cs
index a3d1c752f265d62fbf956df3b96d149f83534b19..6bb10c6d689cbb5d8682f89c1ac51a939e33944c 100644
--- a/src/Group.cs
+++ b/src/Group.cs
@@ -7,6 +7,12 @@ namespace TournamentManager
     {
         public List<Participant> Members { get; set; }
         public List<Match> Matches { get; set; }
+
+        public Group()
+        {
+            Members = new List<Participant>();
+            Matches = new List<Match>();
+        }
         
         public void GetObjectData(SerializationInfo info, StreamingContext context)
         {
diff --git a/src/GroupControl.cs b/src/GroupControl.cs
index bdfe91e0f16d8b6c41ead9714b3a889e0c77b600..7d7a44c0af7db32e037c1c3d457b883bc6ab4d18 100644
--- a/src/GroupControl.cs
+++ b/src/GroupControl.cs
@@ -48,7 +48,7 @@ namespace TournamentManager.src
 
         public void AddToSecondOpponentList(string[] itemNames)
         {
-            cbFirstOpponent.Items.AddRange((string[])itemNames);
+            cbSecondOpponent.Items.AddRange((string[])itemNames);
         }
 
         private void cbGroup_SelectedIndexChanged(object sender, EventArgs e)
@@ -74,19 +74,21 @@ namespace TournamentManager.src
                 return;
             }
 
-            if (cbGroup.SelectedItem == null || !int.TryParse(cbGroup.SelectedItem.ToString(), out var index))
+            if (cbGroup.SelectedItem == null || !int.TryParse(cbGroup.SelectedItem.ToString()?.Split(" ")[1], out var index))
             {
                 return;
             }
             
             if (!int.TryParse(tbFirstOpponentScore.Text, out var firstScore) ||
-                !int.TryParse(tbFirstOpponentScore.Text, out var secondScore))
+                !int.TryParse(tbSecondOpponentScore.Text, out var secondScore))
             {
+                //TODO: throw some error here as well
+                ClearTextBoxes();
                 return;
             }
             
             OnSubmitClicked(new MatchSelectedEventArgs(cbFirstOpponent.SelectedItem.ToString(),
-                cbSecondOpponent.SelectedItem.ToString(), (firstScore, secondScore), index));
+                cbSecondOpponent.SelectedItem.ToString(), (firstScore, secondScore), index - 1));
         }
         
         protected void OnOpponentsSelected()
@@ -97,13 +99,13 @@ namespace TournamentManager.src
                 return;
             }
 
-            if (cbGroup.SelectedItem == null || !int.TryParse(cbGroup.SelectedItem.ToString(), out var index))
+            if (cbGroup.SelectedItem == null || !int.TryParse(cbGroup.SelectedItem.ToString()?.Split(" ")[1], out var index))
             {
                 return;
             }
             
             OnOpponentsSelected(new OpponentsSelectedEventArgs(cbFirstOpponent.SelectedItem.ToString(),
-                cbSecondOpponent.SelectedItem.ToString(), index));
+                cbSecondOpponent.SelectedItem.ToString(), index - 1));
         }
 
         public void ClearInputData()
diff --git a/src/ManageTournamentForm.cs b/src/ManageTournamentForm.cs
index 92e89ff05e941f30cc2f1a7d1cb928aa22b0a5d4..a2797a4e4fe936bcd28924aeea255688de536f1a 100644
--- a/src/ManageTournamentForm.cs
+++ b/src/ManageTournamentForm.cs
@@ -88,7 +88,7 @@ namespace TournamentManager
             {
                 _groups.Add(new Group());
             }
-
+            
             foreach (var participant in orderedParticipants)
             {