diff --git a/src/AdvancedCalculator/Views/MainView.axaml b/src/AdvancedCalculator/Views/MainView.axaml
index 3b5bbb7..b3d48ad 100644
--- a/src/AdvancedCalculator/Views/MainView.axaml
+++ b/src/AdvancedCalculator/Views/MainView.axaml
@@ -37,10 +37,12 @@
 							 AutomationProperties.Name="Variables list">
 						<ListBox.ItemTemplate>
 							<DataTemplate x:DataType="m:VariableItem">
-								<Button Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
-          AutomationProperties.Name="Insert variable"
-          Command="{Binding #Root.DataContext.InsertVariableCommand}"
-          CommandParameter="{Binding VariableName}">
+								<Button x:DataType="vm:MainViewModel"
+										DataContext="{Binding #Root.DataContext}"
+										Command="{Binding InsertVariableCommand}"
+										CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
+										Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
+										AutomationProperties.Name="Insert variable">
 									<Grid ColumnDefinitions="Auto,*,Auto"
 										  DataContext="{Binding $parent[ListBoxItem].DataContext}"
 										  x:DataType="m:VariableItem">
@@ -55,6 +57,7 @@
 								</Button>
 							</DataTemplate>
 
+
 						</ListBox.ItemTemplate>
 					</ListBox>
 					<TextBlock Text="No variables yet. Define with: x = 5"
@@ -72,10 +75,10 @@
 						<DataTemplate x:DataType="m:FunctionDefinitionItem">
 							<Button x:DataType="vm:MainViewModel"
 									DataContext="{Binding #Root.DataContext}"
-									Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
-									AutomationProperties.Name="Insert function"
 									Command="{Binding InsertFunctionCommand}"
-									CommandParameter="{Binding FunctionName, RelativeSource={RelativeSource AncestorType=ListBoxItem}}">
+									CommandParameter="{Binding $parent[ListBoxItem].DataContext}"
+									Background="Transparent" BorderThickness="0" Padding="8" MinHeight="44"
+									AutomationProperties.Name="Insert function">
 								<StackPanel Spacing="8"
 											DataContext="{Binding $parent[ListBoxItem].DataContext}"
 											x:DataType="m:FunctionDefinitionItem">
@@ -98,6 +101,7 @@
 							</Button>
 						</DataTemplate>
 
+
 					</ListBox.ItemTemplate>
 				</ListBox>
 			</Grid>