diff --git a/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs b/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs
index 2efa1568..268fc876 100644
--- a/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs
+++ b/JL.Core/Dicts/JMdict/JmdictRecordBuilder.cs
@@ -84,7 +84,7 @@ public static void AddToDictionary(JmdictEntry entry, IDictionary<string, IList<
                     definitionInfoList.Add(sense.SInf);
                     relatedTermList.Add(sense.XRefList.TrimListToArray());
                     antonymList.Add(sense.AntList.TrimListToArray());
-                    loanwordSourceList.Add(sense.LSourceList.Count > 0 ? sense.LSourceList.ToArray() : null);
+                    loanwordSourceList.Add(sense.LSourceList.TrimListToArray());
                 }
             }
 
@@ -212,7 +212,7 @@ public static void AddToDictionary(JmdictEntry entry, IDictionary<string, IList<
                     definitionInfoList.Add(sense.SInf);
                     relatedTermList.Add(sense.XRefList.TrimListToArray());
                     antonymList.Add(sense.AntList.TrimListToArray());
-                    loanwordSourceList.Add(sense.LSourceList.Count > 0 ? sense.LSourceList.ToArray() : null);
+                    loanwordSourceList.Add(sense.LSourceList.TrimListToArray());
                 }
             }
 
diff --git a/JL.Windows/GUI/PreferencesWindow.xaml b/JL.Windows/GUI/PreferencesWindow.xaml
index a9cb374a..fb34593f 100644
--- a/JL.Windows/GUI/PreferencesWindow.xaml
+++ b/JL.Windows/GUI/PreferencesWindow.xaml
@@ -191,41 +191,41 @@
                         </DockPanel>
 
                         <DockPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="Height"
+                            <TextBlock HorizontalAlignment="Left" Text="Dynamic width"
                                        Style="{StaticResource TextBlockDefault}"
                                        TextWrapping="Wrap" VerticalAlignment="Center" />
-                            <hc:NumericUpDown x:Name="MainWindowHeightNumericUpDown" Minimum="1"
-                                              HorizontalAlignment="Right" />
+                            <CheckBox x:Name="MainWindowDynamicWidthCheckBox" HorizontalAlignment="Right" />
                         </DockPanel>
 
                         <DockPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="Dynamic width"
+                            <TextBlock HorizontalAlignment="Left" Text="Max dynamic width"
                                        Style="{StaticResource TextBlockDefault}"
                                        TextWrapping="Wrap" VerticalAlignment="Center" />
-                            <CheckBox x:Name="MainWindowDynamicWidthCheckBox" HorizontalAlignment="Right" />
+                            <hc:NumericUpDown x:Name="MainWindowMaxDynamicWidthNumericUpDown" Minimum="1"
+                                              HorizontalAlignment="Right" />
                         </DockPanel>
 
                         <DockPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="Dynamic height"
+                            <TextBlock HorizontalAlignment="Left" Text="Min dynamic width"
                                        Style="{StaticResource TextBlockDefault}"
                                        TextWrapping="Wrap" VerticalAlignment="Center" />
-                            <CheckBox x:Name="MainWindowDynamicHeightCheckBox"
+                            <hc:NumericUpDown x:Name="MainWindowMinDynamicWidthNumericUpDown" Minimum="100"
                                               HorizontalAlignment="Right" />
                         </DockPanel>
 
                         <DockPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="Max dynamic width"
+                            <TextBlock HorizontalAlignment="Left" Text="Height"
                                        Style="{StaticResource TextBlockDefault}"
                                        TextWrapping="Wrap" VerticalAlignment="Center" />
-                            <hc:NumericUpDown x:Name="MainWindowMaxDynamicWidthNumericUpDown" Minimum="1"
+                            <hc:NumericUpDown x:Name="MainWindowHeightNumericUpDown" Minimum="1"
                                               HorizontalAlignment="Right" />
                         </DockPanel>
 
                         <DockPanel>
-                            <TextBlock HorizontalAlignment="Left" Text="Min dynamic width"
+                            <TextBlock HorizontalAlignment="Left" Text="Dynamic height"
                                        Style="{StaticResource TextBlockDefault}"
                                        TextWrapping="Wrap" VerticalAlignment="Center" />
-                            <hc:NumericUpDown x:Name="MainWindowMinDynamicWidthNumericUpDown" Minimum="100"
+                            <CheckBox x:Name="MainWindowDynamicHeightCheckBox"
                                               HorizontalAlignment="Right" />
                         </DockPanel>