diff --git a/TimedShutdown/Views/ShellRootView.xaml b/TimedShutdown/Views/ShellRootView.xaml
index 8dad97e..c3765a5 100644
--- a/TimedShutdown/Views/ShellRootView.xaml
+++ b/TimedShutdown/Views/ShellRootView.xaml
@@ -85,29 +85,38 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
                 </Grid.ColumnDefinitions>
                 
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-            <!-- Row 6: Hostname/IP-->
-            <Label Content="Hostname/IP Address:" Grid.Row="0" Grid.Column="0" Margin="0,5,0,0"/>
-                <TextBox Text="{Binding RemoteShutdown, Mode=TwoWay}" Grid.Row="0" Grid.Column="1"
-                     Padding="5" Margin="10,5,5,0"
+            <!-- Row 6: Shutdown Type -->
+            <Label Content="Shutdown Type:" Grid.Row="0" Grid.Column="0" />
+                <RadioButton Content="Local" Grid.Row="0" Grid.Column="1"
+                             Margin="10,5,0,0"/>
+                <RadioButton Content="Remote" Grid.Row="0" Grid.Column="2"
+                             Margin="10,5,0,0"/>
+
+            <!-- Row 7: Hostname/IP -->
+            <Label Content="Hostname/IP Address:" Grid.Row="1" Grid.Column="0" Margin="0,5,0,0"/>
+                <TextBox Text="{Binding RemoteShutdown, Mode=TwoWay}" Grid.Row="1" Grid.Column="1"
+                     Padding="5" Margin="10,5,5,0" Grid.ColumnSpan="2"
                      ToolTip="Enter the machine name or IP address to remotely shutdown. NOTE: This will only work on machines part of the same Windows Domain."/>
                 
-            <!-- Row 7: Ping remote host -->
-            <Label Content="Options:" Grid.Row="1" Grid.Column="0"/>
+            <!-- Row 8: Ping remote host -->
+            <Label Content="Options:" Grid.Row="2" Grid.Column="0"/>
                 <CheckBox  IsChecked="{Binding PingRemoteHost, Mode=OneWayToSource}" Content="Ping remote host"
-                           Grid.Row="1" Grid.Column="1" Margin="10,5,0,0"/>
+                           Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,5,0,0"/>
 
-            <!-- Row 8: Ping status -->
-            <Label Content="Status:" Grid.Row="2" Grid.Column="0"/>
-                <Label Content="{Binding PingRemoteHostStatus}" Grid.Row="2" Grid.Column="1"/>
-                
+            <!-- Row 9: Ping status -->
+            <Label Content="Status:" Grid.Row="3" Grid.Column="0"/>
+                <Label Content="{Binding PingRemoteHostStatus}" Grid.Row="3" Grid.Column="1"/>
             </Grid>
         </Expander>
     </StackPanel>