diff --git a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs
index b280374..39f4dbd 100644
--- a/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs
+++ b/StructureHelper/Infrastructure/UI/DataContexts/PrimitiveBase.cs
@@ -267,6 +267,7 @@ namespace StructureHelper.Infrastructure.UI.DataContexts
             OnPropertyChanged(nameof(Color));
             OnPropertyChanged(nameof(CenterX));
             OnPropertyChanged(nameof(CenterY));
+            OnPropertyChanged(nameof(InvertedCenterY));
             OnPropertyChanged(nameof(SetMaterialColor));
             OnPropertyChanged(nameof(Triangulate));
             OnPropertyChanged(nameof(PrimitiveWidth));
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png
new file mode 100644
index 0000000..33374c6
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Calculator.png differ
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Circle.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Circle.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Circle.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Move primitives to center.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Move primitives to center.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/MovePrimitivesToCenter.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add point.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Add point.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Point.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete beam.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete beam.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Beam.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete column.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Edit_Concrete column.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/RC_Column.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Rebar.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png
similarity index 100%
rename from StructureHelper/Infrastructure/UI/Icons/32х32_Border/Add_Rebar.png
rename to StructureHelper/Infrastructure/UI/Icons/32х32_Border/Rebar.png
diff --git a/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png
new file mode 100644
index 0000000..d1d50e4
Binary files /dev/null and b/StructureHelper/Infrastructure/UI/Icons/32х32_Border/Run.png differ
diff --git a/StructureHelper/StructureHelper.csproj b/StructureHelper/StructureHelper.csproj
index 944f740..71ec422 100644
--- a/StructureHelper/StructureHelper.csproj
+++ b/StructureHelper/StructureHelper.csproj
@@ -25,6 +25,8 @@
   <ItemGroup>
     <None Remove="Windows\MainWindow\Add_Circle.png" />
     <None Remove="Windows\MainWindow\Add_Rebar.png" />
+    <None Remove="Windows\MainWindow\Calculator.png" />
+    <None Remove="Windows\MainWindow\Circle.png" />
     <None Remove="Windows\MainWindow\Copy.png" />
     <None Remove="Windows\MainWindow\Delete.png" />
     <None Remove="Windows\MainWindow\Edit.png" />
@@ -33,10 +35,13 @@
     <None Remove="Windows\MainWindow\Edit_Concrete column.png" />
     <None Remove="Windows\MainWindow\Edit_Concrete slab.png" />
     <None Remove="Windows\MainWindow\Materials.png" />
+    <None Remove="Windows\MainWindow\MovePrimitivesToCenter.png" />
     <None Remove="Windows\MainWindow\Point_Primitive.png" />
     <None Remove="Windows\MainWindow\Rectangle_Primitive.png" />
+    <None Remove="Windows\MainWindow\Run.png" />
     <None Remove="Windows\MainWindow\ToBackground.png" />
     <None Remove="Windows\MainWindow\ToForeground.png" />
+    <None Remove="Windows\MainWindow\Tools_Settings.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -75,9 +80,12 @@
   <ItemGroup>
     <Resource Include="Windows\MainWindow\Add_Circle.png" />
     <Resource Include="Windows\MainWindow\Add_Rebar.png" />
+    <Resource Include="Windows\MainWindow\Calculator.png" />
+    <Resource Include="Windows\MainWindow\Circle.png" />
     <Resource Include="Windows\MainWindow\Copy.png" />
     <Resource Include="Windows\MainWindow\Delete.png" />
     <Resource Include="Windows\MainWindow\Edit.png" />
+    <Resource Include="Windows\MainWindow\MovePrimitivesToCenter.png" />
     <Resource Include="Windows\MainWindow\Point_Primitive.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -89,8 +97,10 @@
     <Resource Include="Windows\MainWindow\Edit_Concrete column.png" />
     <Resource Include="Windows\MainWindow\Edit_Concrete slab.png" />
     <Resource Include="Windows\MainWindow\Materials.png" />
+    <Resource Include="Windows\MainWindow\Run.png" />
     <Resource Include="Windows\MainWindow\ToBackground.png" />
     <Resource Include="Windows\MainWindow\ToForeground.png" />
+    <Resource Include="Windows\MainWindow\Tools_Settings.png" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/StructureHelper/Windows/MainWindow/Calculator.png b/StructureHelper/Windows/MainWindow/Calculator.png
new file mode 100644
index 0000000..33374c6
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Calculator.png differ
diff --git a/StructureHelper/Windows/MainWindow/Circle.png b/StructureHelper/Windows/MainWindow/Circle.png
new file mode 100644
index 0000000..5b22c6e
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Circle.png differ
diff --git a/StructureHelper/Windows/MainWindow/MainView.xaml b/StructureHelper/Windows/MainWindow/MainView.xaml
index 17084c4..c9e1d42 100644
--- a/StructureHelper/Windows/MainWindow/MainView.xaml
+++ b/StructureHelper/Windows/MainWindow/MainView.xaml
@@ -11,6 +11,7 @@
         xmlns:local="clr-namespace:StructureHelper.Windows.MainWindow"
         xmlns:enums="clr-namespace:StructureHelper.Infrastructure.Enums"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:sys="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
         d:DataContext="{d:DesignInstance local:MainViewModel}"
         Title="StructureHelper" Height="700" Width="1000" MinHeight="400" MinWidth="600">
@@ -21,7 +22,6 @@
             <Setter Property="Margin" Value="2,0,2,0"/>
             <Setter Property="Background" Value="#FFA19BC3"/>
             <Setter Property="BorderBrush" Value="#FF857AB9"/>
-            
         </Style>
         <DataTemplate DataType="{x:Type dataContexts:RectangleViewPrimitive}">
             <dataTemplates:RectangleTemplate/>
@@ -33,50 +33,72 @@
             <dataTemplates:EllipseTemplate/>
         </DataTemplate>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-        <ContextMenu x:Key="PrimitivesMenu">
-            <MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
-                    <MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
-                        <MenuItem.Icon>
-                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
-                        <MenuItem.Icon>
-                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
-                        <MenuItem.Icon>
-                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                    <MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
-                        <MenuItem.Icon>
-                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
-                        </MenuItem.Icon>
-                    </MenuItem>
-                </MenuItem>
-            <MenuItem Header="Templates">
-                <MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete column.png" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Circle_RC.png" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete beam.png" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Add RC slab" Command="{Binding AddSlabCase}">
-                    <MenuItem.Icon>
-                        <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete slab.png" />
-                    </MenuItem.Icon>
-                </MenuItem>
+        <ContextMenu x:Key="EditCopyDelete">
+            <MenuItem Header="Edit" Command="{Binding Edit}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Copy" Command="{Binding Copy}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Delete" Command="{Binding Delete}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+        </ContextMenu>
+        <ContextMenu x:Key="PrimitiveCRUD">
+            <MenuItem Header="Edit" Command="{Binding Edit}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Copy" Command="{Binding Copy}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Delete" Command="{Binding Delete}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <Separator/>
+            <MenuItem Header="To Foreground" Command="{Binding SetToFront}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/ToForeground.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="To Background" Command="{Binding SetToBack}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/ToBackground.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+        </ContextMenu>
+        <ContextMenu x:Key="AnalisesCRUD">
+            <MenuItem Header="Run" Command="{Binding Run}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Run.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <Separator/>
+            <MenuItem Header="Edit" Command="{Binding Edit}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Copy" Command="{Binding Copy}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
+                </MenuItem.Icon>
+            </MenuItem>
+            <MenuItem Header="Delete" Command="{Binding Delete}">
+                <MenuItem.Icon>
+                    <Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
+                </MenuItem.Icon>
             </MenuItem>
         </ContextMenu>
     </Window.Resources>
@@ -96,7 +118,7 @@
                     <Button Content="Delete primitive" Command="{Binding PrimitiveLogic.Delete}"/>
                 </MenuItem>
                 <Button Content="Materials" Command="{Binding EditHeadMaterialsCommand}"/>
-                <Button Content="Move primitives to center" Command="{Binding Path=MovePrimitiveToGravityCenterCommand}"/>
+                <Button Content="Move primitives to center" Command="{Binding MovePrimitiveToGravityCenterCommand}"/>
                 <MenuItem Header="Templates">
                     <Button Content="Concrete beam" Command="{Binding AddBeamCase}"/>
                     <Button Content="Concrete column" Command="{Binding AddColumnCase}"/>
@@ -154,7 +176,7 @@
                     <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete column.png"/>
                 </Button>
                 <Button Command="{Binding AddRCCircleCase}" ToolTip="Add Circle RC Column">
-                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Circle_RC.png"/>
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Circle.png"/>
                 </Button>
                 <Button Command="{Binding AddBeamCase}" ToolTip="Add RC Beam">
                     <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete beam.png"/>
@@ -163,6 +185,22 @@
                     <Image Width="32" Height="32" Source="/Windows/MainWindow/Edit_Concrete slab.png"/>
                 </Button>
             </ToolBar>
+            <ToolBar ToolTip="Analises" DataContext="{Binding CalculatorsLogic}">
+                <Button Command="{Binding Add}" ToolTip="Add Force Calculator">
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Calculator.png"/>
+                </Button>
+                <Button Command="{Binding Run}" ToolTip="Run Calculations">
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Run.png"/>
+                </Button>
+            </ToolBar>
+            <ToolBar ToolTip="Tools">
+                <Button Command="{Binding MovePrimitiveToGravityCenterCommand}" ToolTip="Move All Primitives to Gravity Center">
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/MovePrimitivesToCenter.png"/>
+                </Button>
+                <Button Command="{Binding ShowVisualProperty}" ToolTip="Visual Settings">
+                    <Image Width="32" Height="32" Source="/Windows/MainWindow/Tools_Settings.png"/>
+                </Button>
+            </ToolBar>
         </ToolBarTray>
         <Grid>
             <Grid.RowDefinitions>
@@ -188,14 +226,7 @@
                                     </MenuItem>
                                 </ContextMenu>
                             </Expander.ContextMenu>
-                            <ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}">
-                                <ListBox.ContextMenu>
-                                    <ContextMenu>
-                                        <Button Content="Edit" Command="{Binding Edit}"/>
-                                        <Button Content="Copy" Command="{Binding Copy}"/>
-                                        <Button Content="Delete" Command="{Binding Delete}"/>
-                                    </ContextMenu>
-                                </ListBox.ContextMenu>
+                            <ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ContextMenu="{StaticResource EditCopyDelete}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>
@@ -218,44 +249,54 @@
                                     </MenuItem>
                                 </ContextMenu>
                             </Expander.ContextMenu>
-                            <ListBox ItemsSource="{Binding Items}"  SelectedItem="{Binding SelectedItem}" ItemTemplate="{StaticResource ColoredItemTemplate}">
-                                <ListBox.ContextMenu>
-                                    <ContextMenu>
-                                        <Button Content="Edit" Command="{Binding Edit}"/>
-                                        <Button Content="Copy" Command="{Binding Copy}"/>
-                                        <Button Content="Delete" Command="{Binding Delete}"/>
-                                    </ContextMenu>
-                                </ListBox.ContextMenu>
-                            </ListBox>
+                            <ListBox ItemsSource="{Binding Items}"
+                                     SelectedItem="{Binding SelectedItem}"
+                                     ItemTemplate="{StaticResource ColoredItemTemplate}"
+                                     ContextMenu="{StaticResource EditCopyDelete}"/>
                         </Expander>
-                        <Expander Header="Geometry" MinWidth="20" ContextMenu="{StaticResource PrimitivesMenu}">
-                            <ListBox DataContext="{Binding PrimitiveLogic}" ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ItemTemplate="{StaticResource ColoredItemTemplate}">
-                                <ListBox.ContextMenu>
-                                    <ContextMenu>
-                                        <Button Content="Edit" Command="{Binding Edit}"/>
-                                        <Button Content="Copy" Command="{Binding Copy}"/>
-                                        <Button Content="Delete" Command="{Binding Delete}"/>
-                                        <Button Content="To Foreground" Command="{Binding SetToFront}"/>
-                                        <Button Content="To Background" Command="{Binding SetToBack}"/>
-                                    </ContextMenu>
-                                </ListBox.ContextMenu>
+                        <Expander Header="Geometry" MinWidth="20">
+                            <Expander.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
+                                        <MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                    </MenuItem>
+                                </ContextMenu>
+                            </Expander.ContextMenu>
+                            <ListBox DataContext="{Binding PrimitiveLogic}"
+                                     ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}"
+                                     ItemTemplate="{StaticResource ColoredItemTemplate}" ContextMenu="{StaticResource PrimitiveCRUD}">
                             </ListBox>
                         </Expander>
                         <Expander Header="Analyses" MinWidth="20" DataContext="{Binding CalculatorsLogic}">
                             <Expander.ContextMenu>
                                 <ContextMenu>
-                                    <Button Content="Add Calculator" Command="{Binding Add}"/>
+                                    <MenuItem Header="Add" Command="{Binding Add}">
+                                        <MenuItem.Icon>
+                                            <Image Width="16" Height="16" Source="/Windows/MainWindow/Calculator.png" />
+                                        </MenuItem.Icon>
+                                    </MenuItem>
                                 </ContextMenu>
                             </Expander.ContextMenu>
-                            <ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}">
-                                <ListBox.ContextMenu>
-                                    <ContextMenu>
-                                        <Button Content="Run" Command="{Binding Run}"/>
-                                        <Button Content="Edit" Command="{Binding Edit}"/>
-                                        <Button Content="Copy" Command="{Binding Copy}"/>
-                                        <Button Content="Delete" Command="{Binding Delete}"/>
-                                    </ContextMenu>
-                                </ListBox.ContextMenu>
+                            <ListBox ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" ContextMenu="{StaticResource AnalisesCRUD}">
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid>
@@ -274,7 +315,55 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                     <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
-                        <Canvas Name="WorkPlane" ClipToBounds="True" Width="{Binding CanvasWidth}" Height="{Binding CanvasHeight}" ContextMenu="{StaticResource PrimitivesMenu}">
+                        <Canvas Name="WorkPlane" ClipToBounds="True" Width="{Binding CanvasWidth}" Height="{Binding CanvasHeight}">
+                            <Canvas.ContextMenu>
+                                <ContextMenu>
+                                    <MenuItem Header="Add" DataContext="{Binding PrimitiveLogic}">
+                                        <MenuItem Header="Rectangle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Rectangle}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Rectangle_Primitive.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Circle" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Circle}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Circle.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Rebar" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Reinforcement}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Add_Rebar.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Point" Command="{Binding Add}" CommandParameter="{x:Static enums:PrimitiveType.Point}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Point_primitive.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                    </MenuItem>
+                                    <MenuItem Header="Templates" DataContext="{Binding}">
+                                        <MenuItem Header="Add Rectangle RC Column" Command="{Binding AddColumnCase}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete column.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Add Circle RC Column" Command="{Binding AddRCCircleCase}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Circle_RC.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Add RC Beam" Command="{Binding AddBeamCase}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete beam.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Add RC slab" Command="{Binding AddSlabCase}">
+                                            <MenuItem.Icon>
+                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit_Concrete slab.png" />
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                    </MenuItem>
+                                </ContextMenu>
+                            </Canvas.ContextMenu>
                             <i:Interaction.Behaviors>
                                 <infrastructure:MouseBehaviour MouseX="{Binding PanelX, Mode=OneWayToSource}" MouseY="{Binding PanelY, Mode=OneWayToSource}"/>
                             </i:Interaction.Behaviors>
@@ -303,7 +392,7 @@
                             </Canvas.Background>
                             <Line X1="0" X2="{Binding XX2}" Y1="{Binding XY1}" Y2="{Binding XY1}" Stroke="Red" StrokeThickness="{Binding AxisLineThickness}"/>
                             <Line X1="{Binding YX1}" X2="{Binding YX1}" Y1="0" Y2="{Binding YY2}" Stroke="ForestGreen" StrokeThickness="{Binding AxisLineThickness}"/>
-                            <ItemsControl ItemsSource="{Binding PrimitiveLogic.Items}" d:DataContext="{d:DesignInstance vm:MainViewModel}">
+                            <ItemsControl DataContext="{Binding PrimitiveLogic}" ItemsSource="{Binding Items}" ContextMenu="{StaticResource PrimitiveCRUD}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
                                         <Canvas/>
@@ -318,35 +407,6 @@
                                         <EventSetter Event="MouseDown" Handler="ContentPresenter_MouseLeftButtonDown"/>
                                     </Style>
                                 </ItemsControl.ItemContainerStyle>
-                                <ItemsControl.ContextMenu>
-                                    <ContextMenu>
-                                        <MenuItem Header="Edit" Command="{Binding PrimitiveLogic.Edit}">
-                                            <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Edit.png" />
-                                            </MenuItem.Icon>
-                                        </MenuItem>
-                                        <MenuItem Header="Copy" Command="{Binding PrimitiveLogic.Copy}">
-                                            <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Copy.png" />
-                                            </MenuItem.Icon>
-                                        </MenuItem>
-                                        <MenuItem Header="Delete" Command="{Binding PrimitiveLogic.Delete}">
-                                            <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/Delete.png" />
-                                            </MenuItem.Icon>
-                                        </MenuItem>
-                                        <MenuItem Header="To Foreground" Command="{Binding PrimitiveLogic.SetToFront}">
-                                            <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/ToForeground.png" />
-                                            </MenuItem.Icon>
-                                        </MenuItem>
-                                        <MenuItem Header="To Background" Command="{Binding PrimitiveLogic.SetToBack}">
-                                            <MenuItem.Icon>
-                                                <Image Width="16" Height="16" Source="/Windows/MainWindow/ToBackground.png" />
-                                            </MenuItem.Icon>
-                                        </MenuItem>
-                                    </ContextMenu>
-                                </ItemsControl.ContextMenu>
                             </ItemsControl>
                         </Canvas>
                     </ScrollViewer>
@@ -373,7 +433,5 @@
                 </StatusBarItem>
             </StatusBar>
         </Grid>
-
-
     </DockPanel>
 </Window>
diff --git a/StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png b/StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png
new file mode 100644
index 0000000..85d4e1c
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/MovePrimitivesToCenter.png differ
diff --git a/StructureHelper/Windows/MainWindow/Run.png b/StructureHelper/Windows/MainWindow/Run.png
new file mode 100644
index 0000000..d1d50e4
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Run.png differ
diff --git a/StructureHelper/Windows/MainWindow/Tools_Settings.png b/StructureHelper/Windows/MainWindow/Tools_Settings.png
new file mode 100644
index 0000000..f94e364
Binary files /dev/null and b/StructureHelper/Windows/MainWindow/Tools_Settings.png differ