diff --git a/layout.xaml b/layout.xaml
index 8ec7357..19248fa 100644
--- a/layout.xaml
+++ b/layout.xaml
@@ -8,7 +8,7 @@
         FontFamily="Segoe UI">
 
   <Window.Resources>
-    <!-- Rounded TextBox style -->
+    <!-- Rounded TextBox style with placeholder -->
     <Style x:Key="RoundedTextBox" TargetType="TextBox">
       <Setter Property="Background" Value="#2d2d3a"/>
       <Setter Property="Foreground" Value="White"/>
@@ -21,9 +21,22 @@
       <Setter Property="Template">
         <Setter.Value>
           <ControlTemplate TargetType="TextBox">
-            <Border CornerRadius="10" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-              <ScrollViewer x:Name="PART_ContentHost"/>
-            </Border>
+            <Grid>
+              <Border CornerRadius="10" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
+              <ScrollViewer x:Name="PART_ContentHost" Margin="10,0,0,0"/>
+              <TextBlock x:Name="Watermark"
+                         Text="{TemplateBinding Tag}"
+                         Foreground="#888"
+                         Margin="10,0,0,0"
+                         VerticalAlignment="Center"
+                         IsHitTestVisible="False"
+                         Visibility="Collapsed"/>
+            </Grid>
+            <ControlTemplate.Triggers>
+              <Trigger Property="Text" Value="">
+                <Setter TargetName="Watermark" Property="Visibility" Value="Visible"/>
+              </Trigger>
+            </ControlTemplate.Triggers>
           </ControlTemplate>
         </Setter.Value>
       </Setter>
@@ -101,44 +114,35 @@
 
       <TextBlock Text="InstaClient Provisioning Utility" FontSize="20" FontWeight="SemiBold" Foreground="White" HorizontalAlignment="Center" Margin="0,0,0,10"/>
 
-      <!-- Input Fields -->
+      <!-- Inputs -->
       <StackPanel Orientation="Vertical">
-        <TextBlock Name="CompanyLabel" Text="Company Name:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <TextBox Name="CompanyNameBox" Style="{StaticResource RoundedTextBox}"/>
+        <TextBox Name="CompanyNameBox" Style="{StaticResource RoundedTextBox}" Tag="Company Name"/>
+        <TextBox Name="PhoneBox" Style="{StaticResource RoundedTextBox}" Tag="Phone Number"/>
+        <TextBox Name="WebsiteBox" Style="{StaticResource RoundedTextBox}" Tag="Website"/>
 
-        <TextBlock Name="PhoneLabel" 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"/>
-        <TextBox Name="WebsiteBox" Style="{StaticResource RoundedTextBox}"/>
-
-        <TextBlock Name="StreetLabel" Text="Street Address:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <Grid Margin="0,0,0,0">
+        <!-- Street + Country -->
+        <Grid Margin="0,5,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"/>
+          <TextBox Name="StreetBox" Style="{StaticResource RoundedTextBox}" Tag="Street Address" Grid.Column="0" Margin="0,0,8,0"/>
+          <TextBox Name="CountryBox" Style="{StaticResource RoundedTextBox}" Tag="Country" Grid.Column="1"/>
         </Grid>
 
-        <TextBlock Name="CityLabel" Text="City:" Margin="0,5,0,0" Foreground="#cccccc"/>
-        <Grid Margin="0,0,0,0">
+        <!-- City + Province + Postal Code -->
+        <Grid Margin="0,5,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"/>
+          <TextBox Name="CityBox" Style="{StaticResource RoundedTextBox}" Tag="City" Grid.Column="0" Margin="0,0,8,0"/>
+          <TextBox Name="ProvinceBox" Style="{StaticResource RoundedTextBox}" Tag="Province/State" Grid.Column="1" Margin="0,0,8,0"/>
+          <TextBox Name="PostalCodeBox" Style="{StaticResource RoundedTextBox}" Tag="Postal Code" 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 -->
+        <!-- Tool Selection -->
         <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">
@@ -157,6 +161,7 @@
           <Button Name="SubmitBtn" Content="Provision Now" Width="120" Height="38" Margin="5" Style="{StaticResource FancyButton}"/>
         </StackPanel>
 
+        <!-- Status -->
         <TextBlock Name="StatusBlock" Foreground="LightGreen" TextAlignment="Center" Margin="0,15,0,0"/>
       </StackPanel>
     </StackPanel>
diff --git a/main.ps1 b/main.ps1
index fe34205..38be37b 100644
--- a/main.ps1
+++ b/main.ps1
@@ -73,24 +73,15 @@ $Pax8Box           = $window.FindName("Pax8Box")
 $LoginBtn          = $window.FindName("LoginBtn")
 $SubmitBtn         = $window.FindName("SubmitBtn")
 $StatusBlock       = $window.FindName("StatusBlock")
-$phoneLabel        = $window.FindName("PhoneLabel")
-$companyLabel      = $window.FindName("CompanyLabel")
 $websiteBox        = $window.FindName("WebsiteBox")
 $streetBox         = $window.FindName("StreetBox")
 $cityBox           = $window.FindName("CityBox")
 $provinceBox       = $window.FindName("ProvinceBox")
 $postalCodeBox     = $window.FindName("PostalCodeBox")
 $countryBox        = $window.FindName("CountryBox")
-$websiteLabel      = $window.FindName("WebsiteLabel")
-$streetLabel       = $window.FindName("StreetLabel")
-$cityLabel         = $window.FindName("CityLabel")
-$provinceLabel     = $window.FindName("ProvinceLabel")
-$postalLabel   = $window.FindName("PostalLabel")
-$countryLabel      = $window.FindName("CountryLabel")
 
 
 $PhoneBox.Visibility = 'Collapsed'
-$phoneLabel.Visibility = 'Collapsed'
 $SubmitBtn.Visibility = 'Collapsed'
 $DattoBox.Visibility = 'Collapsed'
 $AutotaskBox.Visibility = 'Collapsed'
@@ -101,19 +92,12 @@ $CyberQPBox.Visibility = 'Collapsed'
 $Pax8Box.Visibility = 'Collapsed'
 $SelectAllBox.Visibility = 'Collapsed'
 $CompanyNameBox.Visibility = 'Collapsed'
-$companyLabel.Visibility = 'Collapsed'
 $websiteBox.Visibility = 'Collapsed'
-$websiteLabel.Visibility = 'Collapsed'
 $streetBox.Visibility = 'Collapsed'
-$streetLabel.Visibility = 'Collapsed'
 $cityBox.Visibility = 'Collapsed'
-$cityLabel.Visibility = 'Collapsed'
 $provinceBox.Visibility = 'Collapsed'
-$provinceLabel.Visibility = 'Collapsed'
 $postalCodeBox.Visibility = 'Collapsed'
-$postalLabel.Visibility = 'Collapsed'
 $countryBox.Visibility = 'Collapsed'
-$countryLabel.Visibility = 'Collapsed'
 
 $BackupBox.IsEnabled = $false
 $ITGlueBox.IsEnabled = $false
@@ -122,46 +106,30 @@ $CyberQPBox.IsEnabled = $false
 
 $AutotaskBox.Add_Checked({
     $PhoneBox.Visibility = 'Visible'
-    $phoneLabel.Visibility = 'Visible'
 })
 
 $AutotaskBox.Add_Unchecked({
     $PhoneBox.Visibility = 'Collapsed'
-    $phoneLabel.Visibility = 'Collapsed'
 })
 
 $Pax8Box.Add_Checked({
     $PhoneBox.Visibility = 'Visible'
-    $phoneLabel.Visibility = 'Visible'
     $websiteBox.Visibility = 'Visible'
-    $websiteLabel.Visibility = 'Visible'
     $streetBox.Visibility = 'Visible'
-    $streetLabel.Visibility = 'Visible'
     $cityBox.Visibility = 'Visible'
-    $cityLabel.Visibility = 'Visible'
     $provinceBox.Visibility = 'Visible'
-    $provinceLabel.Visibility = 'Visible'
     $postalCodeBox.Visibility = 'Visible'
-    $postalLabel.Visibility = 'Visible'
     $countryBox.Visibility = 'Visible'
-    $countryLabel.Visibility = 'Visible'
 })
 
 $Pax8Box.Add_Unchecked({
     $PhoneBox.Visibility = 'Collapsed'
-    $phoneLabel.Visibility = 'Collapsed'
     $websiteBox.Visibility = 'Collapsed'
-    $websiteLabel.Visibility = 'Collapsed'
     $streetBox.Visibility = 'Collapsed'
-    $streetLabel.Visibility = 'Collapsed'
     $cityBox.Visibility = 'Collapsed'
-    $cityLabel.Visibility = 'Collapsed'
     $provinceBox.Visibility = 'Collapsed'
-    $provinceLabel.Visibility = 'Collapsed'
     $postalCodeBox.Visibility = 'Collapsed'
-    $postalLabel.Visibility = 'Collapsed'
     $countryBox.Visibility = 'Collapsed'
-    $countryLabel.Visibility = 'Collapsed'
 })
 
 Write-Host "[INFO] UI control references assigned."
@@ -228,7 +196,6 @@ $LoginBtn.Add_Click({
         $AutotaskBox.Visibility = 'Visible'
         $SelectAllBox.Visibility = 'Visible'
         $CompanyNameBox.Visibility = 'Visible'
-        $companyLabel.Visibility = 'Visible'
         $SubmitBtn.Visibility = 'Visible'
         $BackupBox.Visibility = 'Visible'
         $ITGlueBox.Visibility = 'Visible'