diff --git a/layout.xaml b/layout.xaml
index 28cadb3..8ec7357 100644
--- a/layout.xaml
+++ b/layout.xaml
@@ -103,16 +103,16 @@
 
       <!-- Input Fields -->
       <StackPanel Orientation="Vertical">
-        <TextBlock Text="Company Name:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Name="CompanyLabel" Text="Company Name:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <TextBox Name="CompanyNameBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Text="Phone Number:" Margin="0,10,0,0" Foreground="#cccccc"/>
+        <TextBlock Name="PhoneLabel" Text="Phone Number:" Margin="0,10,0,0" Foreground="#cccccc"/>
         <TextBox Name="PhoneBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Text="Website:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Name="WebsiteLabel" Text="Website:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <TextBox Name="WebsiteBox" Style="{StaticResource RoundedTextBox}"/>
 
-        <TextBlock Text="Street Address / Country:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Name="StreetLabel" Text="Street Address:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <Grid Margin="0,0,0,0">
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="2*" />
@@ -122,7 +122,7 @@
           <TextBox Name="CountryBox" Style="{StaticResource RoundedTextBox}" Grid.Column="1"/>
         </Grid>
 
-        <TextBlock Text="City / Province / Postal Code:" Margin="0,5,0,0" Foreground="#cccccc"/>
+        <TextBlock Name="CityLabel" Text="City:" Margin="0,5,0,0" Foreground="#cccccc"/>
         <Grid Margin="0,0,0,0">
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
@@ -134,6 +134,10 @@
           <TextBox Name="PostalCodeBox" Style="{StaticResource RoundedTextBox}" Grid.Column="2"/>
         </Grid>
 
+        <TextBlock Name="ProvinceLabel" Text="Province/State:" Visibility="Collapsed"/>
+        <TextBlock Name="PostalLabel" Text="Postal Code:" Visibility="Collapsed"/>
+        <TextBlock Name="CountryLabel" Text="Country:" Visibility="Collapsed"/>
+
         <!-- Tools -->
         <CheckBox Name="SelectAllBox" Content="Select All Tools" Margin="0,15,0,0" FontWeight="Bold" Foreground="White" Style="{StaticResource ModernCheckBox}"/>