diff --git a/Views/Radios.xaml b/Views/Radios.xaml
index d51140f..19a852a 100644
--- a/Views/Radios.xaml
+++ b/Views/Radios.xaml
@@ -8,52 +8,51 @@
         mc:Ignorable="d"
         Title="Radios" Closing="Window_Closing" SizeToContent="WidthAndHeight" ResizeMode="NoResize">
 
-    <StackPanel HorizontalAlignment="Left" Orientation="Vertical">
-        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0" Margin="5,0,5,0">
-            <GroupBox.Header>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock>
+    <Grid>
+        <StackPanel>
+            <StackPanel HorizontalAlignment="Left" Orientation="Vertical" Margin="5,0,5,0">
+                <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                    <GroupBox.Header>
+                        <TextBlock>
                             <emoji:EmojiInline Text="📻"/>
                             <Run Text="{x:Static properties:Resources.Radio_SearchStation}"/>
-                    </TextBlock>
-                </StackPanel>
-            </GroupBox.Header>
-            <Grid VerticalAlignment="Top">
-                <StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                        <StackPanel HorizontalAlignment="Stretch">
-                            <TextBlock Text="{x:Static properties:Resources.Radio_Name}"  HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,0,0,0" />
-                            <TextBox x:Name="NameSearch" KeyDown="SearchHandler" Text="" TextWrapping="Wrap" HorizontalAlignment="Left" Width="200" Margin="5,6,0,0"/>
+                        </TextBlock>
+                    </GroupBox.Header>
+                    <StackPanel Orientation="Vertical" Margin="5,0,5,0">
+                        <StackPanel Orientation="Horizontal">
+                            <StackPanel Orientation="Vertical">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Name}" Margin="0,0,0,5"/>
+                                <TextBox x:Name="NameSearch" KeyDown="SearchHandler" Width="200" Margin="0,4,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Tags}" Margin="0,0,0,5"/>
+                                <TextBox x:Name="TagSearch" KeyDown="SearchHandler" Width="300" Margin="0,4,0,0"/>
+                            </StackPanel>
+
+                            <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+                                <TextBlock Text="{x:Static properties:Resources.Radio_Country}" Margin="0,0,0,5"/>
+                                <ComboBox x:Name="CountryList" SelectedIndex="0" KeyDown="SearchHandler" Width="240" ScrollViewer.CanContentScroll="False"/>
+                            </StackPanel>
                         </StackPanel>
 
-                        <StackPanel HorizontalAlignment="Stretch" Margin="20,0,0,0">
-                            <TextBlock Text="{x:Static properties:Resources.Radio_Tags}"  HorizontalAlignment="Stretch" VerticalAlignment="Bottom" />
-                            <TextBox x:Name="TagSearch" KeyDown="SearchHandler" Text="" TextWrapping="Wrap" HorizontalAlignment="Left" Width="300" Margin="0,6,0,0"/>
-                        </StackPanel>
-
-                        <StackPanel HorizontalAlignment="Stretch" Margin="20,0,0,0">
-                            <TextBlock Text="{x:Static properties:Resources.Radio_Country}" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" />
-                            <ComboBox x:Name="CountryList" SelectedIndex="0" KeyDown="SearchHandler" Width="240" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,2,0,0" ScrollViewer.CanContentScroll="False"/>
+                        <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                            <Button Content="{x:Static properties:Resources.Radio_Search}" Click="Search_Clicked" Padding="5, 2"/>
+                            <Button Content="{x:Static properties:Resources.Radio_Reset}" Click="Reset_Clicked" Margin="10,0,0,0" Padding="5, 2"/>
+                            <TextBlock x:Name="SearchStatus" Margin="15,1,0,0" FontStyle="Italic" />
                         </StackPanel>
                     </StackPanel>
+                </GroupBox>
+            </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="5,7.5,0,0">
-                        <Button Content="{x:Static properties:Resources.Radio_Search}" Click="Search_Clicked" Padding="5, 2"/>
-                        <Button Content="{x:Static properties:Resources.Radio_Reset}" Click="Reset_Clicked" Margin="10,0,0,0" Padding="5, 2"/>
-                        <TextBlock x:Name="SearchStatus" Text="" Margin="15,1,0,0" FontStyle="Italic" />
-                    </StackPanel>
-                </StackPanel>
-            </Grid>
-        </GroupBox>
-
-        <Grid Margin="5,10,5,5" MaxHeight="600" MinWidth="800" MaxWidth="800">
-            <Grid.Resources>
+            <Grid Margin="5,10,5,5" MaxHeight="600" MinWidth="800" MaxWidth="800">
+                <Grid.Resources>
                 <DataTemplate x:Key="CountryTemplate">
                     <emoji:TextBlock TextAlignment="Center" Text="{Binding Country}"/>
                 </DataTemplate>
             </Grid.Resources>
             <DataGrid Name="RadioListGrid" MouseDoubleClick="Row_DoubleClick" CanUserAddRows="False" CanUserDeleteRows="False"
-                          CanUserReorderColumns="False" CanUserResizeRows="False" IsReadOnly="True"
+                          CanUserReorderColumns="False" CanUserResizeRows="False" IsReadOnly="True" SelectionMode="Single"
                           HeadersVisibility="Column" GridLinesVisibility="None" VirtualizingPanel.ScrollUnit="Pixel">
                 <DataGrid.Columns>
                     <DataGridTemplateColumn Header="🏳️" CellTemplate="{StaticResource CountryTemplate}" MinWidth="25" />
@@ -70,7 +69,6 @@
                 </DataGrid.CellStyle>
             </DataGrid>
         </Grid>
-        
-        
     </StackPanel>
+    </Grid>
 </Window>