diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 702ae01..50d8fed 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -68,7 +68,7 @@
     <NoWarn>
     </NoWarn>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/EgtCAM5Resources.xaml b/EgtCAM5Resources.xaml
index 8908d44..2473816 100644
--- a/EgtCAM5Resources.xaml
+++ b/EgtCAM5Resources.xaml
@@ -113,8 +113,8 @@
    </Style>
 
    <Style x:Key="EgtCAM5_InputButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
-      <Setter Property="Height" Value="30"/>
-      <Setter Property="Width" Value="30"/>
+      <Setter Property="Height" Value="50"/>
+      <Setter Property="Width" Value="50"/>
    </Style>
 
    <Style x:Key="EgtCAM5_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
index 829af8b..e3d63eb 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderView.xaml
@@ -13,16 +13,16 @@
                </Style.Triggers>
             </Style>
          </StackPanel.Style>
-         <TextBlock Text="{Binding TextBlock}"/>
-         <TextBox Text="{Binding TextBox}"/>
+         <TextBlock Text="{Binding TextBlock}" Margin="5,5,0,5"/>
+         <TextBox Text="{Binding TextBox}" Margin="5,0,5,5"/>
          <CheckBox Content="{Binding CheckBoxText}" IsChecked="{Binding IsChecked}"
-                   Visibility="{Binding CheckVisibility}"/>
+                   Visibility="{Binding CheckVisibility}" Margin="5,0,5,5"/>
          <ComboBox ItemsSource="{Binding ComboItemsList}" SelectedIndex="{Binding ComboSelectedIndex}"
-                   Visibility="{Binding ComboVisibility}"/>
+                   Visibility="{Binding ComboVisibility}" Margin="5,0,5,5"/>
          <UniformGrid>
-            <Button Command="{Binding}" Visibility="{Binding ShowVisibility}" Content="Show"
-                    Style="{StaticResource EgtCAM5_Button}"/>
-            <Button Command="{Binding DoneCommand}" Content="Done" Style="{StaticResource EgtCAM5_Button}"/>
+            <Button Command="{Binding ShowCommand}" Visibility="{Binding ShowVisibility}" Content="Show"
+                    Style="{StaticResource EgtCAM5_InputButton}"/>
+            <Button Command="{Binding DoneCommand}" Content="Done" Style="{StaticResource EgtCAM5_InputButton}"/>
          </UniformGrid>
       </StackPanel>
    </Expander>
diff --git a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb
index 1308f2e..054116d 100644
--- a/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb
+++ b/ProjectPage/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderViewModel.vb
@@ -61,6 +61,7 @@ Namespace EgtCAM5
          End Get
          Set(value As String)
             m_TextBox = value
+            Application.Msn.NotifyColleagues(Application.NOTIFYINPUTTEXT, value)
             OnPropertyChanged("TextBox")
          End Set
       End Property
@@ -95,7 +96,7 @@ Namespace EgtCAM5
          End Get
          Set(value As Boolean)
             If value <> m_IsChecked Then
-               Application.Msn.NotifyColleagues(Application.SETLASTBOOLEAN, IsChecked)
+               Application.Msn.NotifyColleagues(Application.SETLASTBOOLEAN, value)
                m_IsChecked = value
                OnPropertyChanged("IsChecked")
             End If
@@ -116,7 +117,7 @@ Namespace EgtCAM5
       End Property
 
       ' ComboBox fields
-      Private m_ComboItemsList As ObservableCollection(Of String)
+      Private m_ComboItemsList As New ObservableCollection(Of String)
       Public Property ComboItemsList As ObservableCollection(Of String)
          Get
             Return m_ComboItemsList
@@ -134,7 +135,7 @@ Namespace EgtCAM5
          End Get
          Set(value As Integer)
             If value <> m_ComboSelectedIndex Then
-               Application.Msn.NotifyColleagues(Application.SETLASTINTEGER, ComboSelectedIndex)
+               Application.Msn.NotifyColleagues(Application.SETLASTINTEGER, value)
                m_ComboSelectedIndex = value
                OnPropertyChanged("ComboSelectedIndex")
             End If
@@ -175,7 +176,6 @@ Namespace EgtCAM5
 #Region "CONSTRUCTOR"
 
       Sub New()
-         Application.Msn.NotifyColleagues(Application.NOTIFYINPUTTEXT, TextBox)
          RegisterMethodsCall()
       End Sub
 
@@ -231,7 +231,7 @@ Namespace EgtCAM5
       ''' Execute the Point.  This method is invoked by the PointCommand.
       ''' </summary>
       Public Sub Done(ByVal param As Object)
-         Application.Msn.NotifyColleagues(Application.DONE, TextBox)
+         Application.Msn.NotifyColleagues(Application.DONE, m_TextBox)
       End Sub
 
       ''' <summary>
@@ -284,6 +284,8 @@ Namespace EgtCAM5
             ShowBtnVisibility = Visibility.Visible
          End If
          FocusTextBox = True
+         IsEnabled = True
+         IsExpanded = True
       End Sub