diff --git a/Ginger/Ginger/Actions/ActionEditPages/ActMobileDeviceEditPage.xaml b/Ginger/Ginger/Actions/ActionEditPages/ActMobileDeviceEditPage.xaml
index 3425a426e2..065f9701e5 100644
--- a/Ginger/Ginger/Actions/ActionEditPages/ActMobileDeviceEditPage.xaml
+++ b/Ginger/Ginger/Actions/ActionEditPages/ActMobileDeviceEditPage.xaml
@@ -10,75 +10,75 @@
 	Title="ActMobileDeviceEditPage">
 
     <DockPanel>
-        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" DockPanel.Dock="Top">
+        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" DockPanel.Dock="Top" Margin="5,0,0,0">
             <Label Style="{StaticResource $LabelStyle}" Content="Operation:"/>
             <UserControlsLib1:UCComboBox x:Name="xOperationNameComboBox" VerticalAlignment="Top" Width="250" Margin="10,0,0,0"/>
         </StackPanel>
 
-        <StackPanel x:Name="xKeyPressPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
+        <StackPanel x:Name="xKeyPressPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="5,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="Key to press:"/>
-            <UserControlsLib1:UCComboBox x:Name="xKeyPressComboBox" VerticalAlignment="Top" Width="200"/>
+            <UserControlsLib1:UCComboBox x:Name="xKeyPressComboBox" VerticalAlignment="Top" Width="250"/>
         </StackPanel>
 
         <StackPanel x:Name="xXY1Pnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="X:" Margin="0 0 0 0"/>
-            <Actions:UCValueExpression x:Name="xX1TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" />
+            <Actions:UCValueExpression x:Name="xX1TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="139" />
             <Label Style="{StaticResource $LabelStyle}" Content="Y:" Margin="10 0 0 0"/>
-            <Actions:UCValueExpression x:Name="xY1TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
+            <Actions:UCValueExpression x:Name="xY1TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="139"/>
         </StackPanel>
 
         <StackPanel x:Name="xXY2Pnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="X:" Margin="0 0 0 0"/>
-            <Activities:UCValueExpression x:Name="xX2TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" />
+            <Activities:UCValueExpression x:Name="xX2TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="139" />
             <Label Style="{StaticResource $LabelStyle}" Content="Y:" Margin="10 0 0 0"/>
-            <Activities:UCValueExpression x:Name="xY2TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
+            <Activities:UCValueExpression x:Name="xY2TxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="139"/>
         </StackPanel>
 
-        <StackPanel x:Name="xPhotoSimulationPnl" HorizontalAlignment="Left" Orientation="Vertical"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
+        <StackPanel x:Name="xPhotoSimulationPnl" HorizontalAlignment="Left" Orientation="Vertical"  DockPanel.Dock="Top" Margin="5,10,0,0" Visibility="Collapsed">
             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top">
                 <Label Style="{StaticResource $LabelStyle}" Content="Choose Photo:"/>
                 <Actions:UCValueExpression x:Name="xPhotoSumilationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="600" />
             </StackPanel>
-            <UserControlsLib1:UcLabel Content="*Action will work only with a UFTM mobile device"></UserControlsLib1:UcLabel>
-            <Frame x:Name="SimulatedPhotoFrame" Background="White" Margin="-5,5,0,0" Width="670" Height="470"></Frame>
+            <UserControlsLib1:UcLabel Content="Note: Action will work only with a UFT Lab mobile device and Packed application." FontSize="9"></UserControlsLib1:UcLabel>
+            <Frame x:Name="SimulatedPhotoFrame" Background="White" Margin="-10,10,0,0" Width="670" Height="470"></Frame>
         </StackPanel>
 
-        <StackPanel x:Name="xAuthSimulationPnl" HorizontalAlignment="Left" Orientation="Vertical"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
+        <StackPanel x:Name="xAuthSimulationPnl" HorizontalAlignment="Left" Orientation="Vertical"  DockPanel.Dock="Top" Margin="5,10,0,0" Visibility="Collapsed">
             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" DockPanel.Dock="Top">
-                <Label Style="{StaticResource $LabelStyle}" Content="Authentication Result:"/>
-                <UserControlsLib1:UCComboBox x:Name="xAuthResultComboBox" VerticalAlignment="Top" Width="200"/>
+                <Label Style="{StaticResource $LabelStyle}" Content="Result:"/>
+                <UserControlsLib1:UCComboBox x:Name="xAuthResultComboBox" VerticalAlignment="Top" Width="240" Margin="40,0,0,0"/>
             </StackPanel>
             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" DockPanel.Dock="Top">
-                <Label x:Name="xAuthResultDetailsLbl" Style="{StaticResource $LabelStyle}" Content="Authentication Result Details:"/>
-                <UserControlsLib1:UCComboBox x:Name="xAuthResultDetailsComboBox" VerticalAlignment="Top" Width="200"/>
+                <Label x:Name="xAuthResultDetailsLbl" Style="{StaticResource $LabelStyle}" Content="Result Details:"/>
+                <UserControlsLib1:UCComboBox x:Name="xAuthResultDetailsComboBox" VerticalAlignment="Top" Width="240"/>
             </StackPanel>
-            <UserControlsLib1:UcLabel Content="*Action will work only with a UFTM mobile device"></UserControlsLib1:UcLabel>
-            <UserControlsLib1:UcLabel Content="*Andoid device will simulate FingerPrint, iOS devices will simulate FaceID"></UserControlsLib1:UcLabel>
+            <UserControlsLib1:UcLabel Content="Note: Action will work only with a UFT Lab mobile device and Packed application." FontSize="9"></UserControlsLib1:UcLabel>
+            <UserControlsLib1:UcLabel Content="Note: Andoid device will simulate FingerPrint, iOS devices will simulate FaceID" FontSize="9"></UserControlsLib1:UcLabel>
         </StackPanel>
 
-        <StackPanel x:Name="xAppPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
+        <StackPanel x:Name="xAppPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="5,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="Application package:"/>
-            <Actions:UCValueExpression x:Name="xAppPackageVE" VerticalAlignment="Top" Width="350"/>
+            <Actions:UCValueExpression x:Name="xAppPackageVE" VerticalAlignment="Top" Width="205"/>
         </StackPanel>
 
         <StackPanel x:Name="xPressPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="Press duration (milliseconds):" Margin="0 0 0 0"/>
-            <Activities:UCValueExpression x:Name="xPressDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" />
+            <Activities:UCValueExpression x:Name="xPressDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="163" />
         </StackPanel>
 
         <StackPanel x:Name="xDragPnl" HorizontalAlignment="Left" Orientation="Horizontal"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
             <Label Style="{StaticResource $LabelStyle}" Content="Drag duration (milliseconds):" Margin="0 0 0 0"/>
-            <Activities:UCValueExpression x:Name="xDragDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
+            <Activities:UCValueExpression x:Name="xDragDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="163"/>
         </StackPanel>
 
         <StackPanel x:Name="xSwipePnl" HorizontalAlignment="Left" Orientation="Vertical"  DockPanel.Dock="Top" Margin="0,10,0,0" Visibility="Collapsed">
             <StackPanel x:Name="xSwipeScalePnl" Orientation="Horizontal">
                 <Label Style="{StaticResource $LabelStyle}" Content="Swipe scale (0.1-1):" Margin="0 0 0 0"/>
-                <Activities:UCValueExpression x:Name="xSwipeScaleTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" />
+                <Activities:UCValueExpression x:Name="xSwipeScaleTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="160"  Margin="57 0 0 0" />
             </StackPanel>
             <StackPanel  Orientation="Horizontal" Margin="0 10 0 0">
                 <Label Style="{StaticResource $LabelStyle}" Content="Swipe duration (milliseconds):" Margin="0 0 0 0"/>
-                <Activities:UCValueExpression x:Name="xSwipeDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="100"/>
+                <Activities:UCValueExpression x:Name="xSwipeDurationTxtBox" HorizontalAlignment="Left" VerticalAlignment="Center" Width="160"/>
             </StackPanel>
         </StackPanel>
 
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Mobile/Appium/GenericAppiumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Mobile/Appium/GenericAppiumDriver.cs
index 29d2c3b7bd..a1f34ffc9d 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Mobile/Appium/GenericAppiumDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Mobile/Appium/GenericAppiumDriver.cs
@@ -972,7 +972,7 @@ private string GetAppPackage(ActMobileDevice act)
             }
             else
             {
-                return act.ActionAppPackage.Value;
+                return act.ActionAppPackage.ValueForDriver;
             }
         }