diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index e0794ee1d..46d3d6746 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -968,7 +968,6 @@ RocketCompCfg.lbl.Length = Length:
 RocketCompCfg.lbl.Thickness = Thickness:
 RocketCompCfg.checkbox.Endcapped = End capped
 RocketCompCfg.checkbox.Endcapped.ttip = Caps (closes) the end of the shoulder.
-RocketCompCfg.title.Noseconeshoulder = Nose cone shoulder
 RocketCompCfg.title.Aftshoulder = Aft shoulder
 RocketCompCfg.border.Foreshoulder = Fore shoulder
 !RocketCompCfg.lbl.Length = Length:
diff --git a/core/resources/l10n/messages_ar.properties b/core/resources/l10n/messages_ar.properties
index 9143bdf63..ad2d8fac7 100644
--- a/core/resources/l10n/messages_ar.properties
+++ b/core/resources/l10n/messages_ar.properties
@@ -959,7 +959,6 @@ RocketCompCfg.lbl.Length = :الطول
 RocketCompCfg.lbl.Thickness = :السماكة
 RocketCompCfg.checkbox.Endcapped = نهاية مغلقة
 RocketCompCfg.checkbox.Endcapped.ttip = .يغلق نهاية الكتف
-RocketCompCfg.title.Noseconeshoulder = كتف أنف الصاروخ
 RocketCompCfg.title.Aftshoulder = مؤخرة الكتف
 RocketCompCfg.border.Foreshoulder = مقدمة الكتف
 !RocketCompCfg.lbl.Length = :الطول
diff --git a/core/resources/l10n/messages_cs.properties b/core/resources/l10n/messages_cs.properties
index 1c6ddaf10..da29be1b0 100644
--- a/core/resources/l10n/messages_cs.properties
+++ b/core/resources/l10n/messages_cs.properties
@@ -656,7 +656,6 @@ RocketCompCfg.lbl.Length = D
 RocketCompCfg.lbl.Thickness = Tlou\u0161tka:
 RocketCompCfg.checkbox.Endcapped = Z�slepka
 RocketCompCfg.ttip.Endcapped = Zdali je konec ramene zaslepen.
-RocketCompCfg.title.Noseconeshoulder = Dr\u017E�k nosn�ho d�lu
 RocketCompCfg.title.Aftshoulder = Dr\u017E�k z�di
 RocketCompCfg.border.Foreshoulder = Dr\u017E�k pr�di 
 !RocketCompCfg.lbl.Length = D�lka:
diff --git a/core/resources/l10n/messages_de.properties b/core/resources/l10n/messages_de.properties
index 4f96295fe..603735e4b 100644
--- a/core/resources/l10n/messages_de.properties
+++ b/core/resources/l10n/messages_de.properties
@@ -713,7 +713,6 @@ RocketCompCfg.lbl.Length = L
 RocketCompCfg.lbl.Thickness = Wandst�rke:
 RocketCompCfg.checkbox.Endcapped = Verschlossenes Ende
 RocketCompCfg.ttip.Endcapped = Gibt an, ob das Ende der Schulter geschlossen ist.
-RocketCompCfg.title.Noseconeshoulder = Spitzenschulter
 RocketCompCfg.title.Aftshoulder = Schulter hinten
 RocketCompCfg.border.Foreshoulder = Schulter vorn
 !RocketCompCfg.lbl.Length = Length:
diff --git a/core/resources/l10n/messages_es.properties b/core/resources/l10n/messages_es.properties
index ab3aa4b89..8d57dcc5a 100644
--- a/core/resources/l10n/messages_es.properties
+++ b/core/resources/l10n/messages_es.properties
@@ -865,7 +865,6 @@ RocketCompCfg.tab.Override.ttip               = Especificar la Masa y el CG del
 RocketCompCfg.tab.Override                        = Masa y CG
 RocketCompCfg.tab.Comment.ttip                 = Especifique un comentario para el componente
 RocketCompCfg.title.Aftshoulder                   = Trasera del acople
-RocketCompCfg.title.Noseconeshoulder              = Acople de la ojiva
 RocketCompCfg.ttip.Endcapped                      = Si el extremo del soporte est\u00e1 truncado.
 RocketCompCfg.lbl.Componentname.ttip               = El nombre del componente.
 
diff --git a/core/resources/l10n/messages_fr.properties b/core/resources/l10n/messages_fr.properties
index 979878fba..511f502cc 100644
--- a/core/resources/l10n/messages_fr.properties
+++ b/core/resources/l10n/messages_fr.properties
@@ -857,7 +857,6 @@ RocketCompCfg.tab.Override.ttip               = For\u00E7age de la Masse et du C
 RocketCompCfg.tab.Override                        = Forcer la valeur
 RocketCompCfg.tab.Comment.ttip                 = Commentaires concernant la pi\u00E8ce
 RocketCompCfg.title.Aftshoulder                   = Epaulement arri\u00E8re
-RocketCompCfg.title.Noseconeshoulder              = Epaulement du c\u00F4ne
 RocketCompCfg.ttip.Endcapped                      = Pr\u00E9cise si l'arri\u00E8re du c\u00F4ne est clos.
 RocketCompCfg.lbl.Componentname.ttip               = Le nom de la pi\u00E8ce.
 
diff --git a/core/resources/l10n/messages_it.properties b/core/resources/l10n/messages_it.properties
index f3e926105..5ad73871d 100644
--- a/core/resources/l10n/messages_it.properties
+++ b/core/resources/l10n/messages_it.properties
@@ -714,7 +714,6 @@ RocketCompCfg.lbl.Length = Lunghezza:
 RocketCompCfg.lbl.Thickness = Spessore:
 RocketCompCfg.checkbox.Endcapped = Chiuso
 RocketCompCfg.ttip.Endcapped = Se la fine della spalla e' chiusa.
-RocketCompCfg.title.Noseconeshoulder = Spalla del naso
 RocketCompCfg.title.Aftshoulder = Spalla posteriore
 RocketCompCfg.border.Foreshoulder = Spalla anteriore
 !RocketCompCfg.lbl.Length = Lunghezza:
diff --git a/core/resources/l10n/messages_ja.properties b/core/resources/l10n/messages_ja.properties
index 235d42cd4..d1c7f35a0 100644
--- a/core/resources/l10n/messages_ja.properties
+++ b/core/resources/l10n/messages_ja.properties
@@ -744,7 +744,6 @@ RocketCompCfg.lbl.Length  = \u9577\u3055\uFF1A
 RocketCompCfg.lbl.Thickness  = \u539A\u3055\uFF1A
 RocketCompCfg.checkbox.Endcapped  = \u7AEF\u306B\u30D5\u30BF\u3092\u3059\u308B
 RocketCompCfg.ttip.Endcapped  = \u30D5\u30BF\u304C\u3042\u308B\u304B\u3069\u3046\u304B
-RocketCompCfg.title.Noseconeshoulder  = \u30CE\u30FC\u30BA\u30B3\u30FC\u30F3\u30B7\u30E7\u30EB\u30C0\u30FC
 RocketCompCfg.title.Aftshoulder  = \u5F8C\u65B9\u30B7\u30E7\u30EB\u30C0\u30FC
 RocketCompCfg.border.Foreshoulder  = \u524D\u65B9\u30B7\u30E7\u30EB\u30C0\u30FC
 !RocketCompCfg.lbl.Length 
diff --git a/core/resources/l10n/messages_nl.properties b/core/resources/l10n/messages_nl.properties
index cdae10dc1..4af03a02b 100644
--- a/core/resources/l10n/messages_nl.properties
+++ b/core/resources/l10n/messages_nl.properties
@@ -863,7 +863,6 @@ RocketCompCfg.lbl.Length = Lengte:
 RocketCompCfg.lbl.Thickness = Dikte:
 RocketCompCfg.checkbox.Endcapped = Einde afgetopt
 RocketCompCfg.ttip.Endcapped = Of het einde van de schouder is afgedekt.
-RocketCompCfg.title.Noseconeshoulder = Neuskegel schouder
 RocketCompCfg.title.Aftshoulder = Achterschouder
 RocketCompCfg.border.Foreshoulder = Voorschouder
 !RocketCompCfg.lbl.Length = Lengte:
diff --git a/core/resources/l10n/messages_pl.properties b/core/resources/l10n/messages_pl.properties
index 0ed164831..64845d0bb 100644
--- a/core/resources/l10n/messages_pl.properties
+++ b/core/resources/l10n/messages_pl.properties
@@ -658,7 +658,6 @@ update.dlg.latestVersion = Korzystasz z najnowszej wersji OpenRocket: %s.
  RocketCompCfg.lbl.Thickness  =  Grubo\u015B\u0107:
  RocketCompCfg.checkbox.Endcapped  =  Zasklepiony koniec
  RocketCompCfg.ttip.Endcapped  =  Czy koniec wpustu jest zasklepiony.
- RocketCompCfg.title.Noseconeshoulder  =  Wpust g\u0142owicy
  RocketCompCfg.title.Aftshoulder  =  Wpust tylny
  RocketCompCfg.border.Foreshoulder  =  Wpust przedni
  !RocketCompCfg.lbl.Length
diff --git a/core/resources/l10n/messages_pt.properties b/core/resources/l10n/messages_pt.properties
index e4db99f01..fa3ad6ac2 100644
--- a/core/resources/l10n/messages_pt.properties
+++ b/core/resources/l10n/messages_pt.properties
@@ -840,7 +840,6 @@ RocketCompCfg.tab.Override.ttip               = Op\u00e7\u00f5es de modifica\u00
 RocketCompCfg.tab.Override                        = Modificar
 RocketCompCfg.tab.Comment.ttip                 = Especifique um coment\u00e1rio para o componente
 RocketCompCfg.title.Aftshoulder                   = Ressalto traseiro
-RocketCompCfg.title.Noseconeshoulder              = Ressalto da ogiva
 RocketCompCfg.ttip.Endcapped                      = Quando a extremidade do ressalto \u00e9 limitada.
 RocketCompCfg.lbl.Componentname.ttip               = Nome do componente.
 
diff --git a/core/resources/l10n/messages_ru.properties b/core/resources/l10n/messages_ru.properties
index 0be529d74..6d768a919 100644
--- a/core/resources/l10n/messages_ru.properties
+++ b/core/resources/l10n/messages_ru.properties
@@ -937,7 +937,6 @@ RocketCompCfg.lbl.Length = \u0414\u043B\u0438\u043D\u0430:
 RocketCompCfg.lbl.Thickness = \u0422\u043E\u043B\u0449\u0438\u043D\u0430:
 RocketCompCfg.checkbox.Endcapped = \u0422\u043E\u0440\u0435\u0446 \u0437\u0430\u0433\u043B\u0443\u0448\u0435\u043D
 RocketCompCfg.checkbox.Endcapped.ttip = \u0417\u0430\u0433\u043B\u0443\u0448\u0430\u0435\u0442 \u0442\u043E\u0440\u0435\u0446 \u043A\u0440\u044B\u0448\u043A\u043E\u0439.
-RocketCompCfg.title.Noseconeshoulder = \u0412\u044B\u0441\u0442\u0443\u043F \u0433\u043E\u043B\u043E\u0432\u043D\u043E\u0433\u043E \u043E\u0431\u0442\u0435\u043A\u0430\u0442\u0435\u043B\u044F
 RocketCompCfg.title.Aftshoulder = \u0417\u0430\u0434\u043D\u0438\u0439 \u0432\u044B\u0441\u0442\u0443\u043F
 RocketCompCfg.border.Foreshoulder = \u041F\u0435\u0440\u0435\u0434\u043D\u0438\u0439 \u0432\u044B\u0441\u0442\u0443\u043F
 !RocketCompCfg.lbl.Length = \u0414\u043B\u0438\u043D\u0430:
diff --git a/core/resources/l10n/messages_uk_UA.properties b/core/resources/l10n/messages_uk_UA.properties
index c82045449..68f4ed718 100644
--- a/core/resources/l10n/messages_uk_UA.properties
+++ b/core/resources/l10n/messages_uk_UA.properties
@@ -816,7 +816,6 @@ RocketCompCfg.lbl.Length = Length:
 RocketCompCfg.lbl.Thickness = Thickness:
 RocketCompCfg.checkbox.Endcapped = End capped
 RocketCompCfg.ttip.Endcapped = Whether the end of the shoulder is capped.
-RocketCompCfg.title.Noseconeshoulder = Nose cone shoulder
 RocketCompCfg.title.Aftshoulder = Aft shoulder
 RocketCompCfg.border.Foreshoulder = Fore shoulder
 !RocketCompCfg.lbl.Length = Length:
diff --git a/core/resources/l10n/messages_zh_CN.properties b/core/resources/l10n/messages_zh_CN.properties
index f9f331f8e..095ff0766 100644
--- a/core/resources/l10n/messages_zh_CN.properties
+++ b/core/resources/l10n/messages_zh_CN.properties
@@ -929,7 +929,6 @@ RocketCompCfg.tab.Override.ttip               = \u8D28\u91CF\u53CA\u91CD\u5FC3\u
 RocketCompCfg.tab.Override                        = \u8986\u5199
 RocketCompCfg.tab.Comment.ttip                 = \u7EC4\u4EF6\u6CE8\u91CA
 RocketCompCfg.title.Aftshoulder                   = \u524D\u8FDE\u63A5\u5904
-RocketCompCfg.title.Noseconeshoulder              = \u5934\u9525\u8FDE\u63A5\u5904
 RocketCompCfg.ttip.Endcapped                      = \u8FDE\u63A5\u5904\u7EC8\u7AEF\u662F\u5426\u6709\u76D6.
 RocketCompCfg.lbl.Componentname.ttip               = \u7EC4\u4EF6\u540D\u79F0.
 
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
index 697d9b8fe..55a33a53f 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
@@ -755,7 +755,7 @@ public class RocketComponentConfig extends JPanel {
 	
 	
 	protected JPanel shoulderTab() {
-		JPanel panel = new JPanel(new MigLayout("fill"));
+		JPanel panel = new JPanel(new MigLayout("fillx"));
 		DoubleModel m0 = new DoubleModel(0);
 		
 		////  Fore shoulder, not for NoseCone
@@ -856,7 +856,7 @@ public class RocketComponentConfig extends JPanel {
 			valueNameShoulder = "Shoulder";
 			valueNameRadius = "BaseRadius";
 			//// Nose cone shoulder
-			sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Noseconeshoulder")));
+			sub.setBorder(null);
 		} else {
 			//// Aft shoulder
 			sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Aftshoulder")));