diff --git a/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs b/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
index 7770494ae..c6c4e786e 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
@@ -148,11 +148,14 @@ namespace Barotrauma
                 TextManager.Get("RecommendedCrewExperience") + ": " + (string.IsNullOrEmpty(RecommendedCrewExperience) ? TextManager.Get("unknown") : RecommendedCrewExperience),
                 "", frame, GUI.SmallFont);
 
-            new GUITextBlock(new Rectangle(246, 120, 100, 20),
-                TextManager.Get("CompatibleContentPackages") + ": " + string.Join(", ", CompatibleContentPackages),
+            new GUITextBlock(new Rectangle(246, 120, 0, 20),
+                TextManager.Get("CompatibleContentPackages") + ":\n" + string.Join(", ", CompatibleContentPackages),
                 "", Alignment.TopLeft, Alignment.TopLeft, frame, true, GUI.SmallFont);
 
-            var descr = new GUITextBlock(new Rectangle(0, 200, 0, 100), Description, "", Alignment.TopLeft, Alignment.TopLeft, frame, true, GUI.SmallFont);
+            var descrBox = new GUIListBox(new Rectangle(0, 200, 0, 120), "", frame);
+
+            var descr = new GUITextBlock(new Rectangle(0, 0, descrBox.Rect.Width - 15, 0), Description + "\n", "", Alignment.TopLeft, Alignment.TopLeft, null, true, GUI.SmallFont);
+            descrBox.AddChild(descr);
             descr.CanBeFocused = false;
         }
 
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
index 9b5417693..b477aee46 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
@@ -139,7 +139,7 @@ namespace Barotrauma
                 infoButton.UserData = sub;
                 infoButton.OnClicked += (component, userdata) =>
                 {
-                    var msgBox = new GUIMessageBox("", "", 550, 350);
+                    var msgBox = new GUIMessageBox("", "", 550, 400);
                     ((Submarine)userdata).CreatePreviewWindow(msgBox.InnerFrame);
                     return true;
                 };
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
index e50451d00..6eeeb15b5 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
@@ -793,7 +793,7 @@ namespace Barotrauma
                 infoButton.UserData = sub;
                 infoButton.OnClicked += (component, userdata) =>
                 {
-                    var msgBox = new GUIMessageBox("", "", 550, 350);
+                    var msgBox = new GUIMessageBox("", "", 550, 400);
                     ((Submarine)userdata).CreatePreviewWindow(msgBox.InnerFrame);
                     return true;
                 };
diff --git a/Barotrauma/BarotraumaShared/Submarines/Aegir Mark III.sub b/Barotrauma/BarotraumaShared/Submarines/Aegir Mark III.sub
index 46a84530c..43e5391fd 100644
Binary files a/Barotrauma/BarotraumaShared/Submarines/Aegir Mark III.sub and b/Barotrauma/BarotraumaShared/Submarines/Aegir Mark III.sub differ
diff --git a/Barotrauma/BarotraumaShared/Submarines/Nehalennia.sub b/Barotrauma/BarotraumaShared/Submarines/Nehalennia.sub
index b72efa23f..d2aa53015 100644
Binary files a/Barotrauma/BarotraumaShared/Submarines/Nehalennia.sub and b/Barotrauma/BarotraumaShared/Submarines/Nehalennia.sub differ
diff --git a/Barotrauma/BarotraumaShared/Submarines/The Blind Carp.sub b/Barotrauma/BarotraumaShared/Submarines/The Blind Carp.sub
index 1a91a0560..a025a3fc3 100644
Binary files a/Barotrauma/BarotraumaShared/Submarines/The Blind Carp.sub and b/Barotrauma/BarotraumaShared/Submarines/The Blind Carp.sub differ
diff --git a/Barotrauma/BarotraumaShared/Submarines/The Nibbler.sub b/Barotrauma/BarotraumaShared/Submarines/The Nibbler.sub
index d8d82201a..e619fb42c 100644
Binary files a/Barotrauma/BarotraumaShared/Submarines/The Nibbler.sub and b/Barotrauma/BarotraumaShared/Submarines/The Nibbler.sub differ
diff --git a/Barotrauma/BarotraumaShared/Submarines/Vellamo.sub b/Barotrauma/BarotraumaShared/Submarines/Vellamo.sub
index 99f0d9dd3..4a67bba2c 100644
Binary files a/Barotrauma/BarotraumaShared/Submarines/Vellamo.sub and b/Barotrauma/BarotraumaShared/Submarines/Vellamo.sub differ