diff --git a/layout.xaml b/layout.xaml
index a677bca..28cadb3 100644
--- a/layout.xaml
+++ b/layout.xaml
@@ -96,38 +96,45 @@
 
   <Grid Margin="20">
     <StackPanel Orientation="Vertical">
-      <!-- Logo at top -->
+      <!-- Logo -->
       <Image Source="https://i.ibb.co/vCTJYn2j/svs-logo-nav-wh.png" Height="60" HorizontalAlignment="Center" Margin="0,0,0,10"/>
 
-      <!-- Title -->
       <TextBlock Text="InstaClient Provisioning Utility" FontSize="20" FontWeight="SemiBold" Foreground="White" HorizontalAlignment="Center" Margin="0,0,0,10"/>
 
-      <!-- Main Content -->
+      <!-- Input Fields -->
       <StackPanel Orientation="Vertical">
-        <TextBlock Name="CompanyLabel" Text="Company Name:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Text="Company Name:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <TextBox Name="CompanyNameBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Name="PhoneLabel" Text="Phone Number:" Margin="0,10,0,0" Foreground="#cccccc"/>
+        <TextBlock Text="Phone Number:" Margin="0,10,0,0" Foreground="#cccccc"/>
         <TextBox Name="PhoneBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Name="WebsiteLabel" Text="Website:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Text="Website:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <TextBox Name="WebsiteBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Name="StreetLabel" Text="Street Address:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="StreetBox" Style="{StaticResource RoundedTextBox}"/>
+        <TextBlock Text="Street Address / Country:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <Grid Margin="0,0,0,0">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+          <TextBox Name="StreetBox" Style="{StaticResource RoundedTextBox}" Grid.Column="0" Margin="0,0,8,0"/>
+          <TextBox Name="CountryBox" Style="{StaticResource RoundedTextBox}" Grid.Column="1"/>
+        </Grid>
 
-        <TextBlock Name="CityLabel" Text="City:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="CityBox" Style="{StaticResource RoundedTextBox}"/>
-
-        <TextBlock Name="ProvinceLabel" Text="Province/State:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="ProvinceBox" Style="{StaticResource RoundedTextBox}"/>
-
-        <TextBlock Name="PostalLabel" Text="Postal Code:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="PostalCodeBox" Style="{StaticResource RoundedTextBox}"/>
-
-        <TextBlock Name="CountryLabel" Text="Country:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="CountryBox" Style="{StaticResource RoundedTextBox}"/>
+        <TextBlock Text="City / Province / Postal Code:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <Grid Margin="0,0,0,0">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+          </Grid.ColumnDefinitions>
+          <TextBox Name="CityBox" Style="{StaticResource RoundedTextBox}" Grid.Column="0" Margin="0,0,8,0"/>
+          <TextBox Name="ProvinceBox" Style="{StaticResource RoundedTextBox}" Grid.Column="1" Margin="0,0,8,0"/>
+          <TextBox Name="PostalCodeBox" Style="{StaticResource RoundedTextBox}" Grid.Column="2"/>
+        </Grid>
 
+        <!-- Tools -->
         <CheckBox Name="SelectAllBox" Content="Select All Tools" Margin="0,15,0,0" FontWeight="Bold" Foreground="White" Style="{StaticResource ModernCheckBox}"/>
 
         <StackPanel Margin="10,5,0,0">
@@ -140,6 +147,7 @@
           <CheckBox Name="Pax8Box" Content="Pax8" Margin="0,4" Style="{StaticResource ModernCheckBox}"/>
         </StackPanel>
 
+        <!-- Buttons -->
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,25,0,0">
           <Button Name="LoginBtn" Content="Login with Microsoft" Width="180" Height="38" Margin="5" Style="{StaticResource FancyButton}"/>
           <Button Name="SubmitBtn" Content="Provision Now" Width="120" Height="38" Margin="5" Style="{StaticResource FancyButton}"/>