diff --git a/MPF/UserControls/UserInput.xaml b/MPF/UserControls/UserInput.xaml
new file mode 100644
index 00000000..e7797b8c
--- /dev/null
+++ b/MPF/UserControls/UserInput.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="MPF.UserControls.UserInput"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:MPF.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+        </Grid.ColumnDefinitions>
+        
+        <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{Binding Label}" />
+        <TextBox Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" Text="{Binding Text}" AcceptsTab="{Binding Tab}" />
+    </Grid>
+</UserControl>
diff --git a/MPF/UserControls/UserInput.xaml.cs b/MPF/UserControls/UserInput.xaml.cs
new file mode 100644
index 00000000..9ed92778
--- /dev/null
+++ b/MPF/UserControls/UserInput.xaml.cs
@@ -0,0 +1,20 @@
+using System.Windows.Controls;
+
+namespace MPF.UserControls
+{
+    /// <summary>
+    /// Interaction logic for UserInput.xaml
+    /// </summary>
+    public partial class UserInput : UserControl
+    {
+        public string Label { get; set; }
+        public string Text { get; set; }
+        public bool Tab { get; set; } = false;
+
+        public UserInput()
+        {
+            InitializeComponent();
+            DataContext = this;
+        }
+    }
+}
diff --git a/MPF/Windows/DiscInformationWindow.xaml b/MPF/Windows/DiscInformationWindow.xaml
index 7a070cfb..51d47464 100644
--- a/MPF/Windows/DiscInformationWindow.xaml
+++ b/MPF/Windows/DiscInformationWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MPF"
+        xmlns:controls="clr-namespace:MPF.UserControls"
         mc:Ignorable="d"
         Title="Disc Information" Height="733" Width="515.132" ResizeMode="NoResize"
         Closed="OnClosed">
@@ -47,17 +48,10 @@
                     <RowDefinition Height="25"/>
                 </Grid.RowDefinitions>
 
-                <Label x:Name="TitleLabel" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Title" />
-                <TextBox x:Name="TitleTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="ForeignTitleLabel" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Foreign Title (Non-Latin)" />
-                <TextBox x:Name="ForeignTitleTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="DiscNumberLetterLabel" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Disc Number / Letter" />
-                <TextBox x:Name="DiscNumberLetterTextBox" Grid.Row="2" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="DiscTitleLabel" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Disc Title" />
-                <TextBox x:Name="DiscTitleTextBox" Grid.Row="3" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <controls:UserInput x:Name="Title" Grid.Row="0" Grid.ColumnSpan="2" Label="Title"/>
+                <controls:UserInput x:Name="ForeignTitle" Grid.Row="1" Grid.ColumnSpan="2" Label="Foreign Title (Non-Latin)"/>
+                <controls:UserInput x:Name="DiscNumberLetter" Grid.Row="2" Grid.ColumnSpan="2" Label="Disc Number / Letter"/>
+                <controls:UserInput x:Name="DiscTitle" Grid.Row="3" Grid.ColumnSpan="2" Label="Disc Title"/>
 
                 <Label x:Name="CategoryLabel" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Category" />
                 <ComboBox x:Name="CategoryComboBox" Grid.Row="4" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" >
@@ -86,71 +80,38 @@
                     </ComboBox.ItemTemplate>
                 </ComboBox>
 
-                <Label x:Name="SerialLabel" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Serial" />
-                <TextBox x:Name="SerialTextBox" Grid.Row="7" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <controls:UserInput x:Name="Serial" Grid.Row="7" Grid.ColumnSpan="2" Label="Serial"/>
 
                 <!-- Layer 0 / Data Side -->
-                <Label x:Name="L0MasteringRingLabel" Grid.Row="8" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mastering Ring" />
-                <TextBox x:Name="L0MasteringRingTextBox" Grid.Row="8" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsTab="True" />
-
-                <Label x:Name="L0MasteringSIDLabel" Grid.Row="9" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mastering SID" />
-                <TextBox x:Name="L0MasteringSIDTextBox" Grid.Row="9" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L0ToolstampLabel" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Toolstamp/Mastering Code" />
-                <TextBox x:Name="L0ToolstampTextBox" Grid.Row="10" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L0MouldSIDLabel" Grid.Row="11" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Mould SID" />
-                <TextBox x:Name="L0MouldSIDTextBox" Grid.Row="11" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L0AdditionalMouldLabel" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Data/L0 Additional Mould" />
-                <TextBox x:Name="L0AdditionalMouldTextBox" Grid.Row="12" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <controls:UserInput x:Name="L0MasteringRing" Grid.Row="8" Grid.ColumnSpan="2" Label="Data/L0 Mastering Ring" Tab="True"/>
+                <controls:UserInput x:Name="L0MasteringSID" Grid.Row="9" Grid.ColumnSpan="2" Label="Data/L0 Mastering SID"/>
+                <controls:UserInput x:Name="L0Toolstamp" Grid.Row="10" Grid.ColumnSpan="2" Label="Data/L0 Toolstamp/Mastering Code"/>
+                <controls:UserInput x:Name="L0MouldSID" Grid.Row="11" Grid.ColumnSpan="2" Label="Data/L0 Mould SID"/>
+                <controls:UserInput x:Name="L0AdditionalMould" Grid.Row="12" Grid.ColumnSpan="2" Label="Data/L0 Additional Mould"/>
 
                 <!-- Layer 1 / Label Side -->
-                <Label x:Name="L1MasteringRingLabel" Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mastering Ring" />
-                <TextBox x:Name="L1MasteringRingTextBox" Grid.Row="13" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsTab="True" />
+                <controls:UserInput x:Name="L1MasteringRing" Grid.Row="13" Grid.ColumnSpan="2" Label="Label/L1 Mastering Ring" Tab="True"/>
+                <controls:UserInput x:Name="L1MasteringSID" Grid.Row="14" Grid.ColumnSpan="2" Label="Label/L1 Mastering SID"/>
+                <controls:UserInput x:Name="L1Toolstamp" Grid.Row="15" Grid.ColumnSpan="2" Label="Label/L1 Toolstamp/Mastering Code"/>
+                <controls:UserInput x:Name="L1MouldSID" Grid.Row="16" Grid.ColumnSpan="2" Label="Label/L1 Mould SID"/>
+                <controls:UserInput x:Name="L1AdditionalMould" Grid.Row="17" Grid.ColumnSpan="2" Label="Label/L1 Additional Mould"/>
 
-                <Label x:Name="L1MasteringSIDLabel" Grid.Row="14" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mastering SID" />
-                <TextBox x:Name="L1MasteringSIDTextBox" Grid.Row="14" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L1ToolstampLabel" Grid.Row="15" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Toolstamp/Mastering Code" />
-                <TextBox x:Name="L1ToolstampTextBox" Grid.Row="15" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L1MouldSIDLabel" Grid.Row="16" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Mould SID" />
-                <TextBox x:Name="L1MouldSIDTextBox" Grid.Row="16" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="L1AdditionalMouldLabel" Grid.Row="17" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Label/L1 Additional Mould" />
-                <TextBox x:Name="L1AdditionalMouldTextBox" Grid.Row="17" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label x:Name="BarcodeLabel" Grid.Row="18" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Barcode" />
-                <TextBox x:Name="BarcodeTextBox" Grid.Row="18" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <!-- This needs to be a multiline textbox -->
-                <Label x:Name="CommentsLabel" Grid.Row="19" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Comments" />
-                <TextBox x:Name="CommentsTextBox" Grid.Row="19" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True" />
-
-                <!-- This needs to be a multiline textbox -->
-                <Label x:Name="ContentsLabel" Grid.Row="20" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Contents" />
-                <TextBox x:Name="ContentsTextBox" Grid.Row="20" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" AcceptsReturn="True" AcceptsTab="True"/>
+                <controls:UserInput x:Name="Barcode" Grid.Row="18" Grid.ColumnSpan="2" Label="Barcode"/>
+                <controls:UserInput x:Name="Comments" Grid.Row="19" Grid.ColumnSpan="2" Label="Comments" Tab="True"/> <!-- This needs to be a multiline textbox -->
+                <controls:UserInput x:Name="Contents" Grid.Row="20" Grid.ColumnSpan="2" Label="Contents" Tab="True"/> <!-- This needs to be a multiline textbox -->
             </Grid>
         </GroupBox>
 
         <GroupBox Grid.Row="1" Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Version and Editions">
             <Grid Height="60">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
 
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
                     <RowDefinition Height="24"/>
                 </Grid.RowDefinitions>
 
-                <Label Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Version" />
-                <TextBox x:Name="VersionTextBox" Grid.Row="0" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
-
-                <Label Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Edition" />
-                <TextBox x:Name="EditionTextBox" Grid.Row="1" Grid.Column="1" Height="22" HorizontalAlignment="Stretch" />
+                <controls:UserInput x:Name="Version" Grid.Row="0" Label="Version"/>
+                <controls:UserInput x:Name="Edition" Grid.Row="1" Label="Edition"/>
             </Grid>
         </GroupBox>
 
diff --git a/MPF/Windows/DiscInformationWindow.xaml.cs b/MPF/Windows/DiscInformationWindow.xaml.cs
index 03cdf09f..4a9a57ba 100644
--- a/MPF/Windows/DiscInformationWindow.xaml.cs
+++ b/MPF/Windows/DiscInformationWindow.xaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using System.Windows.Media;
 using MPF.Data;
 using MPF.Web;
 
@@ -58,16 +57,17 @@ namespace MPF.Windows
             {
                 case MediaType.CDROM:
                 case MediaType.GDROM:
-                    L0MasteringRingLabel.Content = "Data-Side Mastering Ring";
-                    L0MasteringSIDLabel.Content = "Data-Side Mastering SID";
-                    L0ToolstampLabel.Content = "Data-Side Toolstamp/Mastering Code";
-                    L0MouldSIDLabel.Content = "Data-Side Mould SID";
-                    L0AdditionalMouldLabel.Content = "Data-Side Additional Mould";
-                    L1MasteringRingLabel.Content = "Label-Side Mastering Ring";
-                    L1MasteringSIDLabel.Content = "Label-Side Mastering SID";
-                    L1ToolstampLabel.Content = "Label-Side Toolstamp/Mastering Code";
-                    L1MouldSIDLabel.Content = "Label-Side Mould SID";
-                    L1AdditionalMouldLabel.Content = "Label-Side Additional Mould";
+                    L0MasteringRing.Label = "Data-Side Mastering Ring";
+                    L0MasteringSID.Label = "Data-Side Mastering SID";
+                    L0Toolstamp.Label = "Data-Side Toolstamp/Mastering Code";
+                    L0MouldSID.Label = "Data-Side Mould SID";
+                    L0AdditionalMould.Label = "Data-Side Additional Mould";
+
+                    L1MasteringRing.Label = "Label-Side Mastering Ring";
+                    L1MasteringSID.Label = "Label-Side Mastering SID";
+                    L1Toolstamp.Label = "Label-Side Toolstamp/Mastering Code";
+                    L1MouldSID.Label = "Label-Side Mould SID";
+                    L1AdditionalMould.Label = "Label-Side Additional Mould";
                     break;
 
                 case MediaType.DVD:
@@ -79,30 +79,32 @@ namespace MPF.Windows
                     // Single-layer discs should read the same as CDs
                     if (SubmissionInfo?.SizeAndChecksums?.Layerbreak == default(long))
                     {
-                        L0MasteringRingLabel.Content = "Data-Side Mastering Ring";
-                        L0MasteringSIDLabel.Content = "Data-Side Mastering SID";
-                        L0ToolstampLabel.Content = "Data-Side Toolstamp/Mastering Code";
-                        L0MouldSIDLabel.Content = "Data-Side Mould SID";
-                        L0AdditionalMouldLabel.Content = "Data-Side Additional Mould";
-                        L1MasteringRingLabel.Content = "Label-Side Mastering Ring";
-                        L1MasteringSIDLabel.Content = "Label-Side Mastering SID";
-                        L1ToolstampLabel.Content = "Label-Side Toolstamp/Mastering Code";
-                        L1MouldSIDLabel.Content = "Label-Side Mould SID";
-                        L1AdditionalMouldLabel.Content = "Label-Side Additional Mould";
+                        L0MasteringRing.Label = "Data-Side Mastering Ring";
+                        L0MasteringSID.Label = "Data-Side Mastering SID";
+                        L0Toolstamp.Label = "Data-Side Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Data-Side Mould SID";
+                        L0AdditionalMould.Label = "Data-Side Additional Mould";
+
+                        L1MasteringRing.Label = "Label-Side Mastering Ring";
+                        L1MasteringSID.Label = "Label-Side Mastering SID";
+                        L1Toolstamp.Label = "Label-Side Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Label-Side Mould SID";
+                        L1AdditionalMould.Label = "Label-Side Additional Mould";
                     }
                     // Double-layer discs should have different naming
                     else
                     {
-                        L0MasteringRingLabel.Content = "Layer 0 Mastering Ring";
-                        L0MasteringSIDLabel.Content = "Layer 0 Mastering SID";
-                        L0ToolstampLabel.Content = "Layer 0 Toolstamp/Mastering Code";
-                        L0MouldSIDLabel.Content = "Data-Side Mould SID";
-                        L0AdditionalMouldLabel.Content = "Data-Side Additional Mould";
-                        L1MasteringRingLabel.Content = "Layer 1 Mastering Ring";
-                        L1MasteringSIDLabel.Content = "Layer 1 Mastering SID";
-                        L1ToolstampLabel.Content = "Layer 1 Toolstamp/Mastering Code";
-                        L1MouldSIDLabel.Content = "Label-Side Mould SID";
-                        L1AdditionalMouldLabel.Content = "Label-Side Additional Mould";
+                        L0MasteringRing.Label = "Layer 0 Mastering Ring";
+                        L0MasteringSID.Label = "Layer 0 Mastering SID";
+                        L0Toolstamp.Label = "Layer 0 Toolstamp/Mastering Code";
+                        L0MouldSID.Label = "Data-Side Mould SID";
+                        L0AdditionalMould.Label = "Data-Side Additional Mould";
+
+                        L1MasteringRing.Label = "Layer 1 Mastering Ring";
+                        L1MasteringSID.Label = "Layer 1 Mastering SID";
+                        L1Toolstamp.Label = "Layer 1 Toolstamp/Mastering Code";
+                        L1MouldSID.Label = "Label-Side Mould SID";
+                        L1AdditionalMould.Label = "Label-Side Additional Mould";
                     }
 
                     break;
@@ -114,10 +116,10 @@ namespace MPF.Windows
         /// </summary>
         public void Load()
         {
-            TitleTextBox.Text = SubmissionInfo.CommonDiscInfo.Title ?? "";
-            ForeignTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
-            DiscNumberLetterTextBox.Text = SubmissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
-            DiscTitleTextBox.Text = SubmissionInfo.CommonDiscInfo.DiscTitle ?? "";
+            Title.Text = SubmissionInfo.CommonDiscInfo.Title ?? "";
+            ForeignTitle.Text = SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? "";
+            DiscNumberLetter.Text = SubmissionInfo.CommonDiscInfo.DiscNumberLetter ?? "";
+            DiscTitle.Text = SubmissionInfo.CommonDiscInfo.DiscTitle ?? "";
             CategoryComboBox.SelectedIndex = Categories.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Category);
             RegionComboBox.SelectedIndex = Regions.FindIndex(r => r == SubmissionInfo.CommonDiscInfo.Region);
             if (SubmissionInfo.CommonDiscInfo.Languages != null)
@@ -125,23 +127,23 @@ namespace MPF.Windows
                 foreach (var language in SubmissionInfo.CommonDiscInfo.Languages)
                     Languages.Find(l => l == language).IsChecked = true;
             }
-            SerialTextBox.Text = SubmissionInfo.CommonDiscInfo.Serial ?? "";
-            L0MasteringRingTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
-            L0MasteringSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
-            L0ToolstampTextBox.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
-            L0MouldSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
-            L0AdditionalMouldTextBox.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
-            L1MasteringRingTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
-            L1MasteringSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
-            L1ToolstampTextBox.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
-            L1MouldSIDTextBox.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
-            L1AdditionalMouldTextBox.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
-            BarcodeTextBox.Text = SubmissionInfo.CommonDiscInfo.Barcode ?? "";
-            CommentsTextBox.Text = SubmissionInfo.CommonDiscInfo.Comments ?? "";
-            ContentsTextBox.Text = SubmissionInfo.CommonDiscInfo.Contents ?? "";
+            Serial.Text = SubmissionInfo.CommonDiscInfo.Serial ?? "";
+            L0MasteringRing.Text = SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide ?? "";
+            L0MasteringSID.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide ?? "";
+            L0Toolstamp.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide ?? "";
+            L0MouldSID.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide ?? "";
+            L0AdditionalMould.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide ?? "";
+            L1MasteringRing.Text = SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide ?? "";
+            L1MasteringSID.Text = SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide ?? "";
+            L1Toolstamp.Text = SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide ?? "";
+            L1MouldSID.Text = SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide ?? "";
+            L1AdditionalMould.Text = SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide ?? "";
+            Barcode.Text = SubmissionInfo.CommonDiscInfo.Barcode ?? "";
+            Comments.Text = SubmissionInfo.CommonDiscInfo.Comments ?? "";
+            Contents.Text = SubmissionInfo.CommonDiscInfo.Contents ?? "";
 
-            VersionTextBox.Text = SubmissionInfo.VersionAndEditions.Version ?? "";
-            EditionTextBox.Text = SubmissionInfo.VersionAndEditions.OtherEditions ?? "";
+            Version.Text = SubmissionInfo.VersionAndEditions.Version ?? "";
+            Edition.Text = SubmissionInfo.VersionAndEditions.OtherEditions ?? "";
         }
 
         /// <summary>
@@ -206,10 +208,10 @@ namespace MPF.Windows
         /// </summary>
         private void Save()
         {
-            SubmissionInfo.CommonDiscInfo.Title = TitleTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin = ForeignTitleTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.DiscNumberLetter = DiscNumberLetterTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.DiscTitle = DiscTitleTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Title = Title.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin = ForeignTitle.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscNumberLetter = DiscNumberLetter.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.DiscTitle = DiscTitle.Text ?? "";
             SubmissionInfo.CommonDiscInfo.Category = (CategoryComboBox.SelectedItem as CategoryComboBoxItem)?.Value ?? DiscCategory.Games;
             SubmissionInfo.CommonDiscInfo.Region = (RegionComboBox.SelectedItem as RegionComboBoxItem)?.Value ?? Region.World;
             var languages = new List<Language?>();
@@ -221,23 +223,23 @@ namespace MPF.Windows
             if (languages.Count == 0)
                 languages.Add(null);
             SubmissionInfo.CommonDiscInfo.Languages = languages.ToArray();
-            SubmissionInfo.CommonDiscInfo.Serial = SerialTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = L0MasteringRingTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = L0MasteringSIDTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = L0ToolstampTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = L0MouldSIDTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = L0AdditionalMouldTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = L1MasteringRingTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = L1MasteringSIDTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = L1ToolstampTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = L1MouldSIDTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = L1AdditionalMouldTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.Barcode = BarcodeTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.Comments = CommentsTextBox.Text ?? "";
-            SubmissionInfo.CommonDiscInfo.Contents = ContentsTextBox.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Serial = Serial.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingFirstLayerDataSide = L0MasteringRing.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeFirstLayerDataSide = L0MasteringSID.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeFirstLayerDataSide = L0Toolstamp.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeFirstLayerDataSide = L0MouldSID.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldFirstLayerDataSide = L0AdditionalMould.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringRingSecondLayerLabelSide = L1MasteringRing.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MasteringSIDCodeSecondLayerLabelSide = L1MasteringSID.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.ToolstampMasteringCodeSecondLayerLabelSide = L1Toolstamp.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.MouldSIDCodeSecondLayerLabelSide = L1MouldSID.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.AdditionalMouldSecondLayerLabelSide = L1AdditionalMould.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Barcode = Barcode.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Comments = Comments.Text ?? "";
+            SubmissionInfo.CommonDiscInfo.Contents = Contents.Text ?? "";
 
-            SubmissionInfo.VersionAndEditions.Version = VersionTextBox.Text ?? "";
-            SubmissionInfo.VersionAndEditions.OtherEditions = EditionTextBox.Text ?? "";
+            SubmissionInfo.VersionAndEditions.Version = this.Version.Text ?? "";
+            SubmissionInfo.VersionAndEditions.OtherEditions = Edition.Text ?? "";
         }
 
         #region Event Handlers