diff --git a/.editorconfig b/.editorconfig
index dbc22c1d..a6eaa5dc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -32,4 +32,40 @@ dotnet_naming_symbols.public_symbols.applicable_accessibilities = public, protec
 dotnet_naming_style.first_word_upper.capitalization = pascal_case
 
 # Code quality rules
-dotnet_diagnostic.CA1822.severity = warning
\ No newline at end of file
+dotnet_diagnostic.CA1822.severity = warning
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_labels = one_less_than_current
+csharp_space_around_binary_operators = before_and_after
+[*.{cs,vb}]
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
\ No newline at end of file
diff --git a/Connect-A-Pic-Core/ExternalPorts/ExternalInput.cs b/Connect-A-Pic-Core/ExternalPorts/ExternalInput.cs
index 41913209..780fbe1f 100644
--- a/Connect-A-Pic-Core/ExternalPorts/ExternalInput.cs
+++ b/Connect-A-Pic-Core/ExternalPorts/ExternalInput.cs
@@ -5,8 +5,26 @@ namespace CAP_Core.ExternalPorts
 {
     public class ExternalInput : ExternalPort
     {
-        public LaserType LaserType { get; }
-        public Complex InFlowPower { get; set; }
+        private LaserType _laserType;
+        public LaserType LaserType
+        {
+            get => _laserType;
+            set
+            {
+                _laserType = value;
+                OnPropertyChanged();
+            }
+        }
+        public Complex _inFlowPower;
+        public Complex InFlowPower
+        {
+            get => _inFlowPower;
+            set
+            {
+                _inFlowPower = value;
+                OnPropertyChanged();
+            }
+        }
 		public Complex InFlowField => Complex.FromPolarCoordinates(Math.Sqrt(InFlowPower.Magnitude), InFlowPower.Phase);
 		public ExternalInput(string pinName, LaserType inputLaserType, int tilePositionY, Complex inflowPower) : base(pinName, tilePositionY)
 		{
diff --git a/Connect-A-Pic-Core/ExternalPorts/ExternalPort.cs b/Connect-A-Pic-Core/ExternalPorts/ExternalPort.cs
index 5b38ca64..39f9ec5b 100644
--- a/Connect-A-Pic-Core/ExternalPorts/ExternalPort.cs
+++ b/Connect-A-Pic-Core/ExternalPorts/ExternalPort.cs
@@ -1,7 +1,16 @@
-namespace CAP_Core.ExternalPorts
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace CAP_Core.ExternalPorts
 {
-    public abstract class ExternalPort
+    public abstract class ExternalPort: INotifyPropertyChanged
     {
+        public event PropertyChangedEventHandler? PropertyChanged;
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
         public ExternalPort(string pinName, int tilePositionY)
         {
             PinName = pinName;
@@ -10,5 +19,7 @@ public ExternalPort(string pinName, int tilePositionY)
 
         public string PinName { get; }
         public int TilePositionY { get; }
+
+       
     }
-}
\ No newline at end of file
+}
diff --git a/Connect-A-Pic-Core/Grid/GridManager.cs b/Connect-A-Pic-Core/Grid/GridManager.cs
index 8f8e805f..b9f49f29 100644
--- a/Connect-A-Pic-Core/Grid/GridManager.cs
+++ b/Connect-A-Pic-Core/Grid/GridManager.cs
@@ -12,14 +12,16 @@ public class GridManager
         public IExternalPortManager ExternalPortManager { get; }
         public IComponentRotator ComponentRotator { get; }
         public IComponentRelationshipManager ComponentRelationshipManager { get; }
+        public LightManager LightManager { get; }
 
-        public GridManager(ITileManager tileManager, IComponentMover componentMover, IExternalPortManager externalPortManager, IComponentRotator componentRotator, IComponentRelationshipManager componentRelationshipManager)
+        public GridManager(ITileManager tileManager, IComponentMover componentMover, IExternalPortManager externalPortManager, IComponentRotator componentRotator, IComponentRelationshipManager componentRelationshipManager, LightManager lightManager)
         {
             TileManager = tileManager;
             ComponentMover = componentMover;
             ExternalPortManager = externalPortManager;
             ComponentRotator = componentRotator;
             ComponentRelationshipManager = componentRelationshipManager;
+            LightManager = lightManager;
         }
         public GridManager (int width , int height)
         {
@@ -28,6 +30,7 @@ public GridManager (int width , int height)
             ExternalPortManager = new ExternalPortManager(TileManager);
             ComponentRotator = new ComponentRotator(TileManager,ComponentMover);
             ComponentRelationshipManager = new ComponentRelationshipManager(TileManager);
+            LightManager = new LightManager();
         }
 
     }
diff --git a/Connect-A-Pic-Core/LightCalculation/LightCalculationChangeEventArgs.cs b/Connect-A-Pic-Core/LightCalculation/LightCalculationChangeEventArgs.cs
index ba339fca..ca3b4381 100644
--- a/Connect-A-Pic-Core/LightCalculation/LightCalculationChangeEventArgs.cs
+++ b/Connect-A-Pic-Core/LightCalculation/LightCalculationChangeEventArgs.cs
@@ -1,4 +1,4 @@
-using CAP_Core.ExternalPorts;
+using CAP_Core.ExternalPorts;
 using System.Numerics;
 
 namespace CAP_Core.LightCalculation
diff --git a/Connect-A-Pic-Core/LightCalculation/LightCalculationService.cs b/Connect-A-Pic-Core/LightCalculation/LightCalculationService.cs
index 5ea440a6..e13f80ca 100644
--- a/Connect-A-Pic-Core/LightCalculation/LightCalculationService.cs
+++ b/Connect-A-Pic-Core/LightCalculation/LightCalculationService.cs
@@ -24,13 +24,13 @@ public class LightCalculationService
 
         private SemaphoreSlim Semaphore = new (1, 1);
 
-        public LightCalculationService(GridManager grid, LightManager lightManager, ILightCalculator gridSMatrixAnalyzer)
+        public LightCalculationService(GridManager grid, ILightCalculator gridSMatrixAnalyzer)
         {
             LightInputs = grid.ExternalPortManager.GetAllExternalInputs();
 
             grid.ExternalPortManager.ExternalPorts.CollectionChanged += async (object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) => {
                 LightInputs = grid.ExternalPortManager.GetAllExternalInputs();
-                if (lightManager.IsLightOn)
+                if (grid.LightManager.IsLightOn)
                 {
                     await ShowLightPropagationAsync();
                 }
diff --git a/Scenes/ExternalPortContainer/PortsContainer.cs b/Scenes/ExternalPortContainer/PortsContainer.cs
index ab12d20f..4a52b7a7 100644
--- a/Scenes/ExternalPortContainer/PortsContainer.cs
+++ b/Scenes/ExternalPortContainer/PortsContainer.cs
@@ -9,60 +9,68 @@
 using CAP_Core.ExternalPorts;
 using System.Diagnostics;
 using CAP_Core.LightCalculation;
+using System.ComponentModel;
+using ConnectAPIC.Scripts.ViewModel;
+using ConnectAPIC.LayoutWindow.ViewModel.Commands;
+using ConnectAPIC.Scripts.ViewModel.Commands;
 using ConnectAPic.LayoutWindow;
+using ConnectAPIC.Scenes.RightClickMenu;
+
+
 
 
 [SuperNode(typeof(Dependent))]
 public partial class PortsContainer : Node2D
 {
     public override partial void _Notification(int what);
-    [Dependency] public GridManager GridManager => DependOn<GridManager>();
-    [Dependency] public LightManager LightManager => DependOn<LightManager>();
+    [Dependency] public GridManager Grid => DependOn<GridManager>();
     [Dependency] public LightCalculationService LightCalculator => DependOn<LightCalculationService>();
 
     [Export] public PackedScene ExternalPortViewTemplate { get; set; }
-    [Export] public PackedScene RightClickMenu {  get; set; }
+    [Export] public PackedScene RightClickMenuTemplate {  get; set; }
 
+    public SimpleControlMenu ControlMenu { get; set; }
     public ExternalPortViewFactory PortViewFactory { get; set; }
-    public List<ExternalPortView> Views { get; set; } = new();
+    public List<ExternalPortViewModel> PortViewModels { get; set; } = new();
 
+    //Commands
+    public static InputPowerAdjustCommand inputPowerAdjustCommand;
+    public static InputColorChangeCommand inputColorChangeCommand;
+    public static InputOutputChangeCommand inputOutputChangeCommand;
 
     public void OnResolved()
     {
-        PortViewFactory = new ExternalPortViewFactory(this, GridManager, LightCalculator, LightManager);
+        InitializeCommands();
+        InitializePortsAndPortsFactory();
+        InitializeControlMenuAndConnectToPorts();
+    }
 
-        GridManager.ExternalPortManager.ExternalPorts.CollectionChanged += (object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) =>
+    private void InitializeControlMenuAndConnectToPorts()
+    {
+        foreach (ExternalPortViewModel viewModel in PortViewModels)
         {
-            ExternalPortView tmpView;
-            foreach (ExternalPort port in e.OldItems)
-            {
-                tmpView = Views.Find((view) => port.TilePositionY == view.ViewModel.TilePositionY);
-                Views.Remove(tmpView);
-                tmpView.RightClicked -= View_RightClicked;
-                tmpView.QueueFree();
-            }
-            foreach (ExternalPort port in e.NewItems)
-            {
-                tmpView = PortViewFactory?.InitializeExternalPortView(port);
-                tmpView.RightClicked += View_RightClicked;
-                Views.Add(tmpView);
-            }
-        };
-
-        Views = PortViewFactory?.InitializeExternalPortViewList(GridManager.ExternalPortManager.ExternalPorts);
-
-        foreach (ExternalPortView view in Views) {
-            view.RightClicked += View_RightClicked;
+            viewModel.Clicked += ViewModel_Clicked;
         }
+        ControlMenu = RightClickMenuTemplate.Instantiate<SimpleControlMenu>();
+        ControlMenu.SetPortContainer(this);
+        this.AddChild(ControlMenu);
     }
-
-    private void View_RightClicked(object sender, EventArgs e)
+    private void InitializePortsAndPortsFactory()
+    {
+        PortViewFactory = new ExternalPortViewFactory(this, Grid, LightCalculator);
+        PortViewModels = PortViewFactory?.InitializeExternalPortViewList(Grid.ExternalPortManager.ExternalPorts);
+    }
+    private void InitializeCommands()
     {
-        ExternalPortView view = sender as ExternalPortView;
-        if (view == null) return;
+        inputPowerAdjustCommand = new InputPowerAdjustCommand(Grid);
+        inputColorChangeCommand = new InputColorChangeCommand(Grid);
+        inputOutputChangeCommand = new InputOutputChangeCommand(Grid);
+    }
 
-        //TODO: find out if view is input or output
-        //TODO: build right click menu accordingly (if haven't done it already)
-        //TODO: open right click menu on that ports position (with some offset)
+    private void ViewModel_Clicked(object sender, EventArgs e)
+    {
+        ExternalPortViewModel viewModel = sender as ExternalPortViewModel;
+        if (viewModel == null) return;
+        ControlMenu.ConnectToPort(viewModel);
     }
 }
diff --git a/Scenes/PICEditor/PICEditor.tscn b/Scenes/PICEditor/PICEditor.tscn
index 1341350b..409f21b7 100644
--- a/Scenes/PICEditor/PICEditor.tscn
+++ b/Scenes/PICEditor/PICEditor.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=23 format=3 uid="uid://cu6wqy6xwjfo1"]
+[gd_scene load_steps=24 format=3 uid="uid://cu6wqy6xwjfo1"]
 
 [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_c0scx"]
 [ext_resource type="Script" path="res://Scripts/View/ComponentFactory/ComponentViewFactory.cs" id="2_7hjmy"]
@@ -11,6 +11,7 @@
 [ext_resource type="Script" path="res://Scripts/View/DragDropProxy.cs" id="8_h35r3"]
 [ext_resource type="Script" path="res://Scripts/View/StandardDialogs/NotificationManager.cs" id="9_gj54m"]
 [ext_resource type="PackedScene" uid="uid://bscqmaslppyt8" path="res://Scenes/NotificationBox.tscn" id="10_06t00"]
+[ext_resource type="PackedScene" uid="uid://dx13abdux2230" path="res://Scenes/RightClickMenu/ControlMenu.tscn" id="11_ylcdl"]
 [ext_resource type="PackedScene" uid="uid://bd8isg4mddv21" path="res://Scenes/InGameConsole/InGameConsole.tscn" id="16_7rcst"]
 [ext_resource type="Texture2D" uid="uid://djdwbxfnvfvfb" path="res://Scenes/MenuBar/SaveIcon.png" id="17_q4e7w"]
 [ext_resource type="Texture2D" uid="uid://qtdana7kc4y" path="res://Scenes/MenuBar/LoadIcon.png" id="18_17x6l"]
@@ -57,6 +58,7 @@ metadata/_edit_use_anchors_ = true
 
 [node name="PortContainer" parent="GridView" instance=ExtResource("22_75h2p")]
 ExternalPortViewTemplate = ExtResource("2_dn85u")
+RightClickMenuTemplate = ExtResource("11_ylcdl")
 
 [node name="Control" type="Control" parent="."]
 layout_mode = 3
@@ -199,3 +201,6 @@ NotificationBoxScene = ExtResource("10_06t00")
 [connection signal="toggled" from="GUILayer/MenuBar/HBoxContainer/btnShowLightPropagation" to="GridView" method="_on_btn_show_light_propagation_toggled"]
 [connection signal="pressed" from="GUILayer/MenuBar/HBoxContainer/btnExportNazca" to="GridView" method="_on_btn_export_nazca_pressed"]
 [connection signal="toggled" from="GUILayer/ToolboxControl/MarginContainer/VBoxContainer/HideToggle" to="GUILayer/ToolboxControl" method="OnToggleButtonPressed"]
+[connection signal="WindowClosed" from="GUILayer/HelpWindow" to="MainCamera" method="OnMouseExitedTutorialWindow"]
+[connection signal="mouse_entered" from="GUILayer/HelpWindow" to="MainCamera" method="OnMouseEnteredTutorialWindow"]
+[connection signal="mouse_exited" from="GUILayer/HelpWindow" to="MainCamera" method="OnMouseExitedTutorialWindow"]
diff --git a/Scenes/PopUpWindow/ComponentPlacement.ogv b/Scenes/PopUpWindow/ComponentPlacement.ogv
new file mode 100644
index 00000000..2aad036c
Binary files /dev/null and b/Scenes/PopUpWindow/ComponentPlacement.ogv differ
diff --git a/Scenes/PopUpWindow/ExitButton.png b/Scenes/PopUpWindow/ExitButton.png
new file mode 100644
index 00000000..de96bcc1
Binary files /dev/null and b/Scenes/PopUpWindow/ExitButton.png differ
diff --git a/Scenes/RightClickMenu/TopBar.png.import b/Scenes/PopUpWindow/ExitButton.png.import
similarity index 67%
rename from Scenes/RightClickMenu/TopBar.png.import
rename to Scenes/PopUpWindow/ExitButton.png.import
index 472362bb..639bfea2 100644
--- a/Scenes/RightClickMenu/TopBar.png.import
+++ b/Scenes/PopUpWindow/ExitButton.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cxa7n5a2grbq6"
-path="res://.godot/imported/TopBar.png-ec389bda0865d131c0b24dbb29cb3ea5.ctex"
+uid="uid://bwofnv3cggxhh"
+path="res://.godot/imported/ExitButton.png-fc507b5e0a2c39f38b65afe60146ead0.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Scenes/RightClickMenu/TopBar.png"
-dest_files=["res://.godot/imported/TopBar.png-ec389bda0865d131c0b24dbb29cb3ea5.ctex"]
+source_file="res://Scenes/PopUpWindow/ExitButton.png"
+dest_files=["res://.godot/imported/ExitButton.png-fc507b5e0a2c39f38b65afe60146ead0.ctex"]
 
 [params]
 
diff --git a/Scenes/PopUpWindow/PopUpWindow.cs b/Scenes/PopUpWindow/PopUpWindow.cs
index e54bc35a..b4c7d645 100644
--- a/Scenes/PopUpWindow/PopUpWindow.cs
+++ b/Scenes/PopUpWindow/PopUpWindow.cs
@@ -8,6 +8,8 @@ public partial class PopUpWindow : Control
     {
         [Export] public Button ToggleButton { get; set; }
 
+        //Godot signal for easier handling from gui
+        [Signal] public delegate void WindowClosedEventHandler();
 
         public override void _Ready()
         {
@@ -23,12 +25,14 @@ public override void _Ready()
         private void OnToggleButtonPressed(bool toggledOn)
         {
             Visible = toggledOn;
+            if (!Visible) EmitSignal(SignalName.WindowClosed);
         }
 
         private void OnCloseButtonPressed()
         {
             Visible = false;
             ToggleButton.ButtonPressed = false;
+            EmitSignal(SignalName.WindowClosed);
         }
 
     }
diff --git a/Scenes/PopUpWindow/PopUpWindow.tscn b/Scenes/PopUpWindow/PopUpWindow.tscn
index 9dba5bb5..73e6946a 100644
--- a/Scenes/PopUpWindow/PopUpWindow.tscn
+++ b/Scenes/PopUpWindow/PopUpWindow.tscn
@@ -1,17 +1,19 @@
-[gd_scene load_steps=3 format=3 uid="uid://cpu4bmee8crlg"]
+[gd_scene load_steps=5 format=3 uid="uid://cpu4bmee8crlg"]
 
 [ext_resource type="Script" path="res://Scenes/PopUpWindow/PopUpWindow.cs" id="1_jmlt2"]
 [ext_resource type="Texture2D" uid="uid://cag00ywoyr8q7" path="res://Scenes/PopUpWindow/window.png" id="1_u8fof"]
+[ext_resource type="Texture2D" uid="uid://bwofnv3cggxhh" path="res://Scenes/PopUpWindow/ExitButton.png" id="3_guuwr"]
+[ext_resource type="Theme" uid="uid://b2f4xgnx0xy5e" path="res://Scenes/Assets/Themes/MainTheme.tres" id="3_nygil"]
 
 [node name="PopUpWindow" type="Control"]
 layout_mode = 3
-anchor_right = 0.295833
-anchor_bottom = 0.300926
-offset_bottom = -3.05176e-05
+anchor_right = 0.501953
+anchor_bottom = 0.41276
+offset_right = 61.0001
+offset_bottom = 51.0003
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_jmlt2")
-metadata/_edit_use_anchors_ = true
 
 [node name="NinePatchRect" type="NinePatchRect" parent="."]
 texture_filter = 1
@@ -21,63 +23,146 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+mouse_filter = 1
 texture = ExtResource("1_u8fof")
 patch_margin_left = 28
 patch_margin_top = 28
 patch_margin_right = 28
 patch_margin_bottom = 28
-metadata/_edit_use_anchors_ = true
 
-[node name="VBoxContainer" type="VBoxContainer" parent="NinePatchRect"]
+[node name="MarginContainer" type="MarginContainer" parent="."]
 layout_mode = 1
-anchors_preset = -1
-anchor_left = 0.0528169
-anchor_top = 0.0923077
-anchor_right = 0.950704
-anchor_bottom = 0.907692
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_right = -0.999878
+offset_bottom = 0.000366211
 grow_horizontal = 2
 grow_vertical = 2
+theme_override_constants/margin_left = 35
+theme_override_constants/margin_top = 28
+theme_override_constants/margin_right = 28
+theme_override_constants/margin_bottom = 28
+
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
+layout_mode = 2
+horizontal_scroll_mode = 0
+vertical_scroll_mode = 3
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"]
+layout_mode = 2
 metadata/_edit_use_anchors_ = true
 
-[node name="tip1" type="Label" parent="NinePatchRect/VBoxContainer"]
+[node name="Segment" type="Control" parent="MarginContainer/ScrollContainer/VBoxContainer"]
+custom_minimum_size = Vector2(518, 35)
 layout_mode = 2
-text = "left click and hold to drag  components"
+mouse_filter = 1
 
-[node name="tip2" type="Label" parent="NinePatchRect/VBoxContainer"]
+[node name="tip1" type="Label" parent="MarginContainer/ScrollContainer/VBoxContainer/Segment"]
+custom_minimum_size = Vector2(518, 0)
 layout_mode = 2
-text = "right click  on component to rotate
-"
+offset_right = 3440.0
+offset_bottom = 233.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.15, 0.15)
+mouse_filter = 1
+theme = ExtResource("3_nygil")
+text = "left click the component in toolbar to use it"
+autowrap_mode = 2
 
-[node name="tip3" type="Label" parent="NinePatchRect/VBoxContainer"]
+[node name="Segment2" type="Control" parent="MarginContainer/ScrollContainer/VBoxContainer"]
+custom_minimum_size = Vector2(518, 35)
 layout_mode = 2
-text = "click middle mouse button to delet components
+mouse_filter = 1
+
+[node name="tip1" type="Label" parent="MarginContainer/ScrollContainer/VBoxContainer/Segment2"]
+layout_mode = 2
+offset_top = -4.0
+offset_right = 3460.0
+offset_bottom = 409.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.15, 0.15)
+mouse_filter = 1
+theme = ExtResource("3_nygil")
+text = "left click to place one component,
+left click and drag to place multiple.
 "
+autowrap_mode = 2
 
-[node name="tip4" type="Label" parent="NinePatchRect/VBoxContainer"]
+[node name="Segment3" type="Control" parent="MarginContainer/ScrollContainer/VBoxContainer"]
+custom_minimum_size = Vector2(518, 35)
 layout_mode = 2
+mouse_filter = 1
+
+[node name="tip1" type="Label" parent="MarginContainer/ScrollContainer/VBoxContainer/Segment3"]
+layout_mode = 2
+offset_top = 20.0
+offset_right = 3440.0
+offset_bottom = 433.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.15, 0.15)
+mouse_filter = 1
+theme = ExtResource("3_nygil")
+text = "click middle mouse button to delete the components"
+autowrap_mode = 2
+
+[node name="Segment4" type="Control" parent="MarginContainer/ScrollContainer/VBoxContainer"]
+custom_minimum_size = Vector2(518, 35)
+layout_mode = 2
+mouse_filter = 1
+
+[node name="tip1" type="Label" parent="MarginContainer/ScrollContainer/VBoxContainer/Segment4"]
+layout_mode = 2
+offset_top = 41.0
+offset_right = 3440.0
+offset_bottom = 274.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.15, 0.15)
+mouse_filter = 1
+theme = ExtResource("3_nygil")
 text = "right click and hold to pan"
+autowrap_mode = 2
+
+[node name="Segment5" type="Control" parent="MarginContainer/ScrollContainer/VBoxContainer"]
+custom_minimum_size = Vector2(518, 35)
+layout_mode = 2
+mouse_filter = 1
 
-[node name="tip5" type="Label" parent="NinePatchRect/VBoxContainer"]
+[node name="tip1" type="Label" parent="MarginContainer/ScrollContainer/VBoxContainer/Segment5"]
 layout_mode = 2
+offset_top = 37.0
+offset_right = 3440.0
+offset_bottom = 270.0
+grow_horizontal = 2
+grow_vertical = 2
+scale = Vector2(0.15, 0.15)
+mouse_filter = 1
+theme = ExtResource("3_nygil")
 text = "scroll to zoom"
+autowrap_mode = 2
 
-[node name="Button" type="Button" parent="NinePatchRect"]
+[node name="Button" type="Button" parent="."]
 texture_filter = 1
 layout_mode = 1
-anchors_preset = -1
+anchors_preset = 1
 anchor_left = 1.0
-anchor_top = 1.0
 anchor_right = 1.0
-anchor_bottom = 1.0
-offset_left = -129.0
-offset_top = -84.0
-offset_right = -79.0
-offset_bottom = -53.0
+offset_left = -33.0
+offset_top = -8.0
+offset_right = -5.0
+offset_bottom = 23.0
 grow_horizontal = 0
-grow_vertical = 0
 scale = Vector2(1.5, 1.5)
-text = "Close"
+focus_mode = 0
+mouse_filter = 1
+text = "
+"
+icon = ExtResource("3_guuwr")
 flat = true
 
-[connection signal="pressed" from="NinePatchRect/Button" to="." method="OnCloseButtonPressed"]
-[connection signal="toggled" from="NinePatchRect/Button" to="." method="_on_button_toggled"]
+[connection signal="pressed" from="Button" to="." method="OnCloseButtonPressed"]
+[connection signal="toggled" from="Button" to="." method="_on_button_toggled"]
diff --git a/Scenes/PopUpWindow/window.png b/Scenes/PopUpWindow/window.png
index b8a097c4..2330550b 100644
Binary files a/Scenes/PopUpWindow/window.png and b/Scenes/PopUpWindow/window.png differ
diff --git a/Scenes/RightClickMenu/BlueInputIcon.png b/Scenes/RightClickMenu/BlueInputIcon.png
new file mode 100644
index 00000000..48b0df82
Binary files /dev/null and b/Scenes/RightClickMenu/BlueInputIcon.png differ
diff --git a/Scenes/RightClickMenu/ExitButton.png.import b/Scenes/RightClickMenu/BlueInputIcon.png.import
similarity index 66%
rename from Scenes/RightClickMenu/ExitButton.png.import
rename to Scenes/RightClickMenu/BlueInputIcon.png.import
index e508f3f1..2527fcf9 100644
--- a/Scenes/RightClickMenu/ExitButton.png.import
+++ b/Scenes/RightClickMenu/BlueInputIcon.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://do8y035em52gm"
-path="res://.godot/imported/ExitButton.png-a226ab88421c3a065cf5ed5f55367c82.ctex"
+uid="uid://civbgw8ohuxul"
+path="res://.godot/imported/BlueInputIcon.png-2d776c8c9ab14df9d8da35743bd2bac2.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Scenes/RightClickMenu/ExitButton.png"
-dest_files=["res://.godot/imported/ExitButton.png-a226ab88421c3a065cf5ed5f55367c82.ctex"]
+source_file="res://Scenes/RightClickMenu/BlueInputIcon.png"
+dest_files=["res://.godot/imported/BlueInputIcon.png-2d776c8c9ab14df9d8da35743bd2bac2.ctex"]
 
 [params]
 
diff --git a/Scenes/RightClickMenu/ControlMenu.tscn b/Scenes/RightClickMenu/ControlMenu.tscn
new file mode 100644
index 00000000..6248abfc
--- /dev/null
+++ b/Scenes/RightClickMenu/ControlMenu.tscn
@@ -0,0 +1,227 @@
+[gd_scene load_steps=14 format=3 uid="uid://dx13abdux2230"]
+
+[ext_resource type="Script" path="res://Scenes/RightClickMenu/SimpleControlMenu.cs" id="1_52xip"]
+[ext_resource type="Texture2D" uid="uid://bnhwsteqou1xj" path="res://Scenes/RightClickMenu/ExternalOutputIcon.png" id="4_bggqw"]
+[ext_resource type="Texture2D" uid="uid://1g5psmv4aj8a" path="res://Scenes/RightClickMenu/RedInputIcon.png" id="4_dyqqw"]
+[ext_resource type="PackedScene" uid="uid://cbnwjaf2rjctr" path="res://Scenes/RightClickMenu/Sections/slider_section.tscn" id="4_lktol"]
+[ext_resource type="ButtonGroup" uid="uid://cxi5vciu5p82o" path="res://Scenes/RightClickMenu/InputModeSelectionButtonGroup.tres" id="4_p1asi"]
+[ext_resource type="PackedScene" uid="uid://bibqhya7kmikv" path="res://Scenes/RightClickMenu/Sections/info_section.tscn" id="5_50guf"]
+[ext_resource type="Texture2D" uid="uid://cab2i6pa52wbr" path="res://Scenes/RightClickMenu/GreenInputIcon.png" id="5_aecc8"]
+[ext_resource type="Texture2D" uid="uid://civbgw8ohuxul" path="res://Scenes/RightClickMenu/BlueInputIcon.png" id="6_hkhch"]
+[ext_resource type="Texture2D" uid="uid://bseakecs4865n" path="res://Scenes/RightClickMenu/Body.png" id="8_7xmtp"]
+
+[sub_resource type="Curve" id="Curve_dlfrx"]
+_data = [Vector2(0, 0), 0.0, 3.40635, 0, 0, Vector2(0.996078, 1), 0.0730049, 0.0, 0, 0]
+point_count = 2
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ko678"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0.6, 0.6, 0.6, 0)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0.8, 0.8, 0.8, 0)
+corner_radius_top_left = 20
+corner_radius_top_right = 20
+corner_radius_bottom_right = 20
+corner_radius_bottom_left = 20
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vhgit"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0.6, 0.6, 0.6, 0)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0.8, 0.8, 0.8, 0)
+corner_radius_top_left = 20
+corner_radius_top_right = 20
+corner_radius_bottom_right = 20
+corner_radius_bottom_left = 20
+anti_aliasing = false
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_liije"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0.6, 0.6, 0.6, 0)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0.8, 0.8, 0.8, 0)
+corner_radius_top_left = 20
+corner_radius_top_right = 20
+corner_radius_bottom_right = 20
+corner_radius_bottom_left = 20
+anti_aliasing = false
+
+[node name="ControlMenu" type="Control"]
+light_mask = 0
+texture_filter = 1
+layout_mode = 3
+anchors_preset = 0
+size_flags_horizontal = 0
+mouse_filter = 1
+script = ExtResource("1_52xip")
+ButtonGroup = ExtResource("4_p1asi")
+animationCurve = SubResource("Curve_dlfrx")
+
+[node name="ControlMenu" type="Control" parent="."]
+custom_minimum_size = Vector2(200, 100)
+layout_mode = 1
+anchors_preset = 1
+anchor_left = 1.0
+anchor_right = 1.0
+offset_left = -200.0
+offset_bottom = 100.0
+grow_horizontal = 0
+
+[node name="Body" type="NinePatchRect" parent="ControlMenu"]
+modulate = Color(1, 1, 1, 0.784314)
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 1
+texture = ExtResource("8_7xmtp")
+region_rect = Rect2(0, 0, 128, 128)
+patch_margin_left = 3
+patch_margin_right = 3
+patch_margin_bottom = 20
+
+[node name="SectionContainer" type="VBoxContainer" parent="ControlMenu"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/separation = 0
+
+[node name="HBoxContainer" type="HBoxContainer" parent="ControlMenu/SectionContainer"]
+layout_mode = 2
+theme_override_constants/separation = 2
+alignment = 1
+
+[node name="Red" type="Button" parent="ControlMenu/SectionContainer/HBoxContainer"]
+layout_mode = 2
+focus_mode = 0
+mouse_filter = 1
+theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.588235)
+theme_override_colors/icon_pressed_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_pressed_color = Color(1, 1, 1, 0.705882)
+theme_override_styles/normal = SubResource("StyleBoxFlat_ko678")
+theme_override_styles/hover = SubResource("StyleBoxFlat_vhgit")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_liije")
+toggle_mode = true
+button_group = ExtResource("4_p1asi")
+icon = ExtResource("4_dyqqw")
+icon_alignment = 1
+
+[node name="Green" type="Button" parent="ControlMenu/SectionContainer/HBoxContainer"]
+layout_mode = 2
+focus_mode = 0
+mouse_filter = 1
+theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.588235)
+theme_override_colors/icon_pressed_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_pressed_color = Color(1, 1, 1, 0.705882)
+theme_override_styles/normal = SubResource("StyleBoxFlat_ko678")
+theme_override_styles/hover = SubResource("StyleBoxFlat_vhgit")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_liije")
+toggle_mode = true
+button_group = ExtResource("4_p1asi")
+icon = ExtResource("5_aecc8")
+
+[node name="Blue" type="Button" parent="ControlMenu/SectionContainer/HBoxContainer"]
+layout_mode = 2
+focus_mode = 0
+mouse_filter = 1
+theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.588235)
+theme_override_colors/icon_pressed_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_pressed_color = Color(1, 1, 1, 0.705882)
+theme_override_styles/normal = SubResource("StyleBoxFlat_ko678")
+theme_override_styles/hover = SubResource("StyleBoxFlat_vhgit")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_liije")
+toggle_mode = true
+button_group = ExtResource("4_p1asi")
+icon = ExtResource("6_hkhch")
+
+[node name="Input" type="Button" parent="ControlMenu/SectionContainer/HBoxContainer"]
+layout_mode = 2
+focus_mode = 0
+mouse_filter = 1
+theme_override_colors/icon_normal_color = Color(1, 1, 1, 0.588235)
+theme_override_colors/icon_pressed_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_color = Color(1, 1, 1, 1)
+theme_override_colors/icon_hover_pressed_color = Color(1, 1, 1, 0.705882)
+theme_override_styles/normal = SubResource("StyleBoxFlat_ko678")
+theme_override_styles/hover = SubResource("StyleBoxFlat_vhgit")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_liije")
+toggle_mode = true
+button_group = ExtResource("4_p1asi")
+icon = ExtResource("4_bggqw")
+
+[node name="OutputMenu" type="Control" parent="ControlMenu/SectionContainer"]
+unique_name_in_owner = true
+visible = false
+custom_minimum_size = Vector2(0, 40)
+layout_mode = 2
+mouse_filter = 1
+
+[node name="Power" parent="ControlMenu/SectionContainer/OutputMenu" instance=ExtResource("5_50guf")]
+layout_mode = 2
+offset_right = 200.0
+offset_bottom = 20.0
+metadata/_edit_vertical_guides_ = [237.0]
+
+[node name="PhaseShift" parent="ControlMenu/SectionContainer/OutputMenu" instance=ExtResource("5_50guf")]
+layout_mode = 2
+offset_top = 20.0
+offset_right = 200.0
+offset_bottom = 40.0
+metadata/_edit_vertical_guides_ = [237.0]
+
+[node name="PointerToPort" type="Line2D" parent="ControlMenu/SectionContainer/OutputMenu"]
+position = Vector2(200, -49)
+points = PackedVector2Array(0, 1, 7, 1, 17, 10)
+width = 6.0
+default_color = Color(0.760784, 0.658824, 0.254902, 1)
+
+[node name="InputMenu" type="Control" parent="ControlMenu/SectionContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(0, 40)
+layout_mode = 2
+mouse_filter = 1
+
+[node name="SliderSection" parent="ControlMenu/SectionContainer/InputMenu" instance=ExtResource("4_lktol")]
+layout_mode = 1
+anchors_preset = -1
+anchor_top = -0.125
+anchor_right = 1.0
+anchor_bottom = 1.125
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="PointerToPort" type="Line2D" parent="ControlMenu/SectionContainer/InputMenu"]
+position = Vector2(200, -49)
+points = PackedVector2Array(0, 1, 11, 1, 29, 17)
+width = 6.0
+default_color = Color(0.760784, 0.658824, 0.254902, 1)
+
+[connection signal="mouse_entered" from="ControlMenu" to="." method="OnMouseEntered"]
+[connection signal="mouse_exited" from="ControlMenu" to="." method="OnMouseExited"]
diff --git a/Scenes/RightClickMenu/ExitButton.png b/Scenes/RightClickMenu/ExitButton.png
deleted file mode 100644
index d6951cab..00000000
Binary files a/Scenes/RightClickMenu/ExitButton.png and /dev/null differ
diff --git a/Scenes/RightClickMenu/ExternalOutputIcon.png b/Scenes/RightClickMenu/ExternalOutputIcon.png
new file mode 100644
index 00000000..aef0095e
Binary files /dev/null and b/Scenes/RightClickMenu/ExternalOutputIcon.png differ
diff --git a/Scenes/RightClickMenu/SectionTextureOff.png.import b/Scenes/RightClickMenu/ExternalOutputIcon.png.import
similarity index 65%
rename from Scenes/RightClickMenu/SectionTextureOff.png.import
rename to Scenes/RightClickMenu/ExternalOutputIcon.png.import
index d67767e7..b6959af4 100644
--- a/Scenes/RightClickMenu/SectionTextureOff.png.import
+++ b/Scenes/RightClickMenu/ExternalOutputIcon.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://q76vpqkoamcu"
-path="res://.godot/imported/SectionTextureOff.png-f9e0bace97ca355fc4ce1a6a418104bf.ctex"
+uid="uid://bnhwsteqou1xj"
+path="res://.godot/imported/ExternalOutputIcon.png-3bdd3299ab51890b9df9de609cc49253.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Scenes/RightClickMenu/SectionTextureOff.png"
-dest_files=["res://.godot/imported/SectionTextureOff.png-f9e0bace97ca355fc4ce1a6a418104bf.ctex"]
+source_file="res://Scenes/RightClickMenu/ExternalOutputIcon.png"
+dest_files=["res://.godot/imported/ExternalOutputIcon.png-3bdd3299ab51890b9df9de609cc49253.ctex"]
 
 [params]
 
diff --git a/Scenes/RightClickMenu/GreenInputIcon.png b/Scenes/RightClickMenu/GreenInputIcon.png
new file mode 100644
index 00000000..72687d35
Binary files /dev/null and b/Scenes/RightClickMenu/GreenInputIcon.png differ
diff --git a/Scenes/RightClickMenu/PinButtonOff.png.import b/Scenes/RightClickMenu/GreenInputIcon.png.import
similarity index 66%
rename from Scenes/RightClickMenu/PinButtonOff.png.import
rename to Scenes/RightClickMenu/GreenInputIcon.png.import
index 8710643e..52b9b3b6 100644
--- a/Scenes/RightClickMenu/PinButtonOff.png.import
+++ b/Scenes/RightClickMenu/GreenInputIcon.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ds3bi6wq0upnc"
-path="res://.godot/imported/PinButtonOff.png-263bfc96cc95cf5431ec0b2bdfa6dee5.ctex"
+uid="uid://cab2i6pa52wbr"
+path="res://.godot/imported/GreenInputIcon.png-59c0bfae7a4e38d2a48da696275e99d3.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Scenes/RightClickMenu/PinButtonOff.png"
-dest_files=["res://.godot/imported/PinButtonOff.png-263bfc96cc95cf5431ec0b2bdfa6dee5.ctex"]
+source_file="res://Scenes/RightClickMenu/GreenInputIcon.png"
+dest_files=["res://.godot/imported/GreenInputIcon.png-59c0bfae7a4e38d2a48da696275e99d3.ctex"]
 
 [params]
 
diff --git a/Scenes/RightClickMenu/InputModeSelectionButtonGroup.tres b/Scenes/RightClickMenu/InputModeSelectionButtonGroup.tres
new file mode 100644
index 00000000..66579104
--- /dev/null
+++ b/Scenes/RightClickMenu/InputModeSelectionButtonGroup.tres
@@ -0,0 +1,3 @@
+[gd_resource type="ButtonGroup" format=3 uid="uid://cxi5vciu5p82o"]
+
+[resource]
diff --git a/Scenes/RightClickMenu/PinButtonOff.png b/Scenes/RightClickMenu/PinButtonOff.png
deleted file mode 100644
index 0f1174a5..00000000
Binary files a/Scenes/RightClickMenu/PinButtonOff.png and /dev/null differ
diff --git a/Scenes/RightClickMenu/PinButtonOn.png b/Scenes/RightClickMenu/PinButtonOn.png
deleted file mode 100644
index 14d5e3a1..00000000
Binary files a/Scenes/RightClickMenu/PinButtonOn.png and /dev/null differ
diff --git a/Scenes/RightClickMenu/RedInputIcon.png b/Scenes/RightClickMenu/RedInputIcon.png
new file mode 100644
index 00000000..35de8a67
Binary files /dev/null and b/Scenes/RightClickMenu/RedInputIcon.png differ
diff --git a/Scenes/RightClickMenu/PinButtonOn.png.import b/Scenes/RightClickMenu/RedInputIcon.png.import
similarity index 67%
rename from Scenes/RightClickMenu/PinButtonOn.png.import
rename to Scenes/RightClickMenu/RedInputIcon.png.import
index 35b70647..3a028219 100644
--- a/Scenes/RightClickMenu/PinButtonOn.png.import
+++ b/Scenes/RightClickMenu/RedInputIcon.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cw41lh7tdi071"
-path="res://.godot/imported/PinButtonOn.png-85629caee7bac1b5435148802ef0bf48.ctex"
+uid="uid://1g5psmv4aj8a"
+path="res://.godot/imported/RedInputIcon.png-d0467d83b5cab35a931b20cabc3ff4cc.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Scenes/RightClickMenu/PinButtonOn.png"
-dest_files=["res://.godot/imported/PinButtonOn.png-85629caee7bac1b5435148802ef0bf48.ctex"]
+source_file="res://Scenes/RightClickMenu/RedInputIcon.png"
+dest_files=["res://.godot/imported/RedInputIcon.png-d0467d83b5cab35a931b20cabc3ff4cc.ctex"]
 
 [params]
 
diff --git a/Scenes/RightClickMenu/RightClickMenu.cs b/Scenes/RightClickMenu/RightClickMenu.cs
deleted file mode 100644
index 24efdd38..00000000
--- a/Scenes/RightClickMenu/RightClickMenu.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using Godot;
-using System;
-using System.Diagnostics;
-
-public partial class RightClickMenu : CharacterBody2D
-{
-    bool dragging;
-    bool mouseIn = false;
-    Vector2 direction;
-    Vector2 newPosition;
-    float draggingDistance;
-    float draggingSpeed = 50;
-
-    Area2D area;
-
-    public override void _Ready()
-    {
-        area = GetChild<Area2D>(1);
-        area.MouseShapeEntered += (long shapeIdx) =>
-        {
-            mouseIn = true;
-            Debug.Print("mouse entered");
-        };
-
-        area.MouseShapeExited += (long shapeIdx) => {
-            mouseIn = false;
-            Debug.Print("mouse exited");
-        };
-    }
-
-
-    public override void _UnhandledInput(InputEvent @event)
-    {
-        if (@event is InputEventMouseButton mouseButton) {
-            if (mouseButton.IsPressed() && mouseIn) {
-                draggingDistance = Position.DistanceTo(GetViewport().GetMousePosition());
-                direction = (GetViewport().GetMousePosition() - Position).Normalized();
-                dragging = true;
-                newPosition = GetViewport().GetMousePosition() - Position - draggingDistance*direction;
-            }
-            else
-            {
-                dragging = false;
-            }
-        }
-        else if (@event is InputEventMouseMotion mouseMotion && dragging)
-        {
-            newPosition = GetViewport().GetMousePosition() - Position - draggingDistance * direction;
-        }
-    }
-
-
-    public override void _PhysicsProcess(double delta)
-    {
-        if (dragging)
-        {
-            Velocity = (newPosition - Position) * (new Vector2(draggingSpeed, draggingSpeed));
-            MoveAndSlide();
-        }
-    }
-
-
-    private void MouseEnteredInDragArea()
-    {
-        mouseIn = true;
-        Debug.Print("mouse entered");
-    }
-
-
-    private void MouseExitedDragArea()
-    {
-        mouseIn = false;
-        Debug.Print("mouse exited");
-    }
-
-
-}
-
-
-
diff --git a/Scenes/RightClickMenu/RightClickMenu.tscn b/Scenes/RightClickMenu/RightClickMenu.tscn
deleted file mode 100644
index 42090ace..00000000
--- a/Scenes/RightClickMenu/RightClickMenu.tscn
+++ /dev/null
@@ -1,340 +0,0 @@
-[gd_scene load_steps=10 format=3 uid="uid://tnmccvafekjl"]
-
-[ext_resource type="Script" path="res://Scenes/RightClickMenu/RightClickMenu.cs" id="1_egxol"]
-[ext_resource type="Texture2D" uid="uid://bseakecs4865n" path="res://Scenes/RightClickMenu/Body.png" id="2_0xr5l"]
-[ext_resource type="Texture2D" uid="uid://cxa7n5a2grbq6" path="res://Scenes/RightClickMenu/TopBar.png" id="3_it7mt"]
-[ext_resource type="Texture2D" uid="uid://do8y035em52gm" path="res://Scenes/RightClickMenu/ExitButton.png" id="4_mrron"]
-[ext_resource type="Theme" uid="uid://b2f4xgnx0xy5e" path="res://Scenes/Assets/Themes/MainTheme.tres" id="5_fel5w"]
-[ext_resource type="Texture2D" uid="uid://q76vpqkoamcu" path="res://Scenes/RightClickMenu/SectionTextureOff.png" id="6_rd3o7"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_tyuhw"]
-bg_color = Color(0.733333, 0.580392, 0, 1)
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-border_color = Color(0.380392, 0.329412, 0, 1)
-corner_radius_top_left = 2
-corner_radius_top_right = 2
-corner_radius_bottom_right = 2
-corner_radius_bottom_left = 2
-anti_aliasing = false
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_xc2v1"]
-size = Vector2(211, 25)
-
-[sub_resource type="RectangleShape2D" id="RectangleShape2D_00a0n"]
-size = Vector2(174, 18)
-
-[node name="RightClickMenu" type="CharacterBody2D"]
-script = ExtResource("1_egxol")
-metadata/_edit_vertical_guides_ = [231.0]
-
-[node name="Window" type="Control" parent="."]
-texture_filter = 1
-layout_mode = 3
-anchors_preset = 0
-offset_right = 237.0
-offset_bottom = 292.0
-mouse_filter = 1
-
-[node name="WindowHeader" type="Control" parent="Window"]
-custom_minimum_size = Vector2(10, 0)
-layout_mode = 2
-anchors_preset = 0
-anchor_right = 1.0
-anchor_bottom = 0.086
-offset_bottom = -0.112001
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 1
-metadata/_edit_use_anchors_ = true
-
-[node name="Header" type="NinePatchRect" parent="Window/WindowHeader"]
-layout_mode = 1
-anchors_preset = -1
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-mouse_filter = 1
-texture = ExtResource("3_it7mt")
-region_rect = Rect2(0, 0, 128, 32)
-patch_margin_left = 4
-patch_margin_top = 9
-metadata/_edit_use_anchors_ = true
-
-[node name="TextureButton" type="TextureButton" parent="Window/WindowHeader"]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -28.0
-offset_bottom = 25.0
-grow_horizontal = 0
-mouse_filter = 1
-texture_normal = ExtResource("4_mrron")
-ignore_texture_size = true
-stretch_mode = 4
-
-[node name="BodyContainer" type="Control" parent="Window"]
-layout_mode = 2
-anchors_preset = 0
-anchor_top = 0.0853081
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_vertical = 3
-mouse_filter = 1
-metadata/_edit_use_anchors_ = true
-
-[node name="Body" type="NinePatchRect" parent="Window/BodyContainer"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 1
-texture = ExtResource("2_0xr5l")
-region_rect = Rect2(0, 0, 128, 128)
-patch_margin_left = 3
-patch_margin_right = 3
-patch_margin_bottom = 20
-metadata/_edit_use_anchors_ = true
-
-[node name="SectionContainer" type="VBoxContainer" parent="Window/BodyContainer"]
-unique_name_in_owner = true
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/separation = 0
-metadata/_edit_use_anchors_ = true
-
-[node name="ToggleSection" type="Control" parent="Window/BodyContainer/SectionContainer"]
-custom_minimum_size = Vector2(0, 40)
-layout_mode = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Window/BodyContainer/SectionContainer/ToggleSection"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/separation = 0
-
-[node name="Title" type="Control" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer/Title"]
-layout_mode = 1
-offset_right = 415.0
-offset_bottom = 205.0
-scale = Vector2(0.1, 0.1)
-theme_override_constants/margin_left = 60
-theme_override_constants/margin_top = 0
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer/Title/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 0
-theme = ExtResource("5_fel5w")
-text = "Toggle Section:"
-
-[node name="Body" type="Control" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer/Body"]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -35.0
-offset_top = -4.90995
-offset_bottom = 25.09
-grow_horizontal = 0
-theme_override_constants/margin_top = 7
-theme_override_constants/margin_right = 5
-theme_override_constants/margin_bottom = 7
-
-[node name="Button" type="Button" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer/Body/MarginContainer"]
-layout_mode = 2
-theme_override_styles/normal = SubResource("StyleBoxFlat_tyuhw")
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/ToggleSection/VBoxContainer/Body"]
-layout_mode = 2
-offset_left = 6.0
-offset_top = -1.90995
-offset_right = 1526.0
-offset_bottom = 203.09
-scale = Vector2(0.1, 0.1)
-theme = ExtResource("5_fel5w")
-theme_override_font_sizes/font_size = 0
-text = "Value"
-
-[node name="OnOffSection" type="Control" parent="Window/BodyContainer/SectionContainer"]
-custom_minimum_size = Vector2(0, 40)
-layout_mode = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Window/BodyContainer/SectionContainer/OnOffSection"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/separation = 0
-
-[node name="Title" type="Control" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Title"]
-layout_mode = 1
-offset_right = 415.0
-offset_bottom = 205.0
-scale = Vector2(0.1, 0.1)
-theme_override_constants/margin_left = 60
-theme_override_constants/margin_top = 0
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Title/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 0
-theme = ExtResource("5_fel5w")
-text = "On/Off Section:"
-
-[node name="Body" type="Control" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Body"]
-layout_mode = 2
-offset_left = 35.0
-offset_top = -0.819916
-offset_right = 1555.0
-offset_bottom = 204.18
-scale = Vector2(0.1, 0.1)
-theme = ExtResource("5_fel5w")
-theme_override_font_sizes/font_size = 0
-text = "Off"
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Body"]
-layout_mode = 1
-anchors_preset = 1
-anchor_left = 1.0
-anchor_right = 1.0
-offset_left = -35.0
-offset_top = -3.90996
-offset_bottom = 26.09
-grow_horizontal = 0
-theme_override_constants/margin_top = 7
-theme_override_constants/margin_right = 5
-theme_override_constants/margin_bottom = 7
-
-[node name="Button" type="Button" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Body/MarginContainer"]
-layout_mode = 2
-theme_override_styles/normal = SubResource("StyleBoxFlat_tyuhw")
-
-[node name="TextureRect" type="TextureRect" parent="Window/BodyContainer/SectionContainer/OnOffSection/VBoxContainer/Body"]
-layout_mode = 0
-offset_left = 12.0
-offset_top = 2.18008
-offset_right = 28.0
-offset_bottom = 18.1801
-texture = ExtResource("6_rd3o7")
-expand_mode = 1
-
-[node name="ScrollSection" type="Control" parent="Window/BodyContainer/SectionContainer"]
-custom_minimum_size = Vector2(0, 50)
-layout_mode = 2
-
-[node name="VBoxContainer" type="VBoxContainer" parent="Window/BodyContainer/SectionContainer/ScrollSection"]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-theme_override_constants/separation = 0
-
-[node name="Title" type="Control" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer/Title"]
-layout_mode = 1
-offset_right = 415.0
-offset_bottom = 205.0
-scale = Vector2(0.1, 0.1)
-theme_override_constants/margin_left = 60
-theme_override_constants/margin_top = 0
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer/Title/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 0
-theme = ExtResource("5_fel5w")
-text = "Scroll Bar Section:"
-
-[node name="Body" type="Control" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer"]
-custom_minimum_size = Vector2(0, 30)
-layout_mode = 2
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer/Body"]
-layout_mode = 2
-offset_left = 6.0
-offset_top = -3.90996
-offset_right = 1706.0
-offset_bottom = 201.09
-scale = Vector2(0.1, 0.1)
-theme = ExtResource("5_fel5w")
-text = "Value"
-
-[node name="HScrollBar" type="HScrollBar" parent="Window/BodyContainer/SectionContainer/ScrollSection/VBoxContainer/Body"]
-layout_mode = 0
-offset_left = 6.0
-offset_top = 17.09
-offset_right = 231.0
-offset_bottom = 25.09
-
-[node name="InfoSection" type="Control" parent="Window/BodyContainer/SectionContainer"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-
-[node name="Title" type="Control" parent="Window/BodyContainer/SectionContainer/InfoSection"]
-custom_minimum_size = Vector2(0, 20)
-layout_mode = 2
-anchors_preset = 0
-offset_right = 237.0
-offset_bottom = 20.0
-
-[node name="MarginContainer" type="MarginContainer" parent="Window/BodyContainer/SectionContainer/InfoSection/Title"]
-layout_mode = 1
-offset_right = 2310.0
-offset_bottom = 205.0
-scale = Vector2(0.1, 0.1)
-theme_override_constants/margin_left = 60
-theme_override_constants/margin_top = 0
-theme_override_constants/margin_right = 60
-
-[node name="Title" type="Label" parent="Window/BodyContainer/SectionContainer/InfoSection/Title/MarginContainer"]
-layout_mode = 2
-size_flags_horizontal = 0
-theme = ExtResource("5_fel5w")
-text = "Title: Value"
-
-[node name="Area2D" type="Area2D" parent="."]
-disable_mode = 2
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
-position = Vector2(105.5, 12.5)
-shape = SubResource("RectangleShape2D_xc2v1")
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-visible = false
-position = Vector2(87, 9)
-shape = SubResource("RectangleShape2D_00a0n")
diff --git a/Scenes/RightClickMenu/SectionTextureOff.ase b/Scenes/RightClickMenu/SectionTextureOff.ase
deleted file mode 100644
index 36d3c27f..00000000
Binary files a/Scenes/RightClickMenu/SectionTextureOff.ase and /dev/null differ
diff --git a/Scenes/RightClickMenu/SectionTextureOff.png b/Scenes/RightClickMenu/SectionTextureOff.png
deleted file mode 100644
index 0ac0e1ae..00000000
Binary files a/Scenes/RightClickMenu/SectionTextureOff.png and /dev/null differ
diff --git a/Scenes/RightClickMenu/Sections/ISection.cs b/Scenes/RightClickMenu/Sections/ISection.cs
new file mode 100644
index 00000000..85b21629
--- /dev/null
+++ b/Scenes/RightClickMenu/Sections/ISection.cs
@@ -0,0 +1,47 @@
+using Godot;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+namespace ConnectAPIC.Scenes.RightClickMenu.Sections {
+    public abstract partial class ISection : Node, INotifyPropertyChanged {
+        //To notify if some property of section changed (like if button is pressed to toggle)
+        public event PropertyChangedEventHandler PropertyChanged;
+        private String _title;
+        private String _value;
+        private bool ready = false;
+        public String Title {
+            get => _title;
+            set {
+                _title = value;
+                if (ready)
+                    titleLabel.Text = value;
+            }
+        }
+        public String Value {
+            get => _value;
+            set {
+                _value = value;
+                if (ready)
+                    valueLabel.Text = value;
+            }
+        }
+
+        public PropertyChangedEventHandler PropertyChangeHandler { get; set; }
+
+        private Label titleLabel;
+        private Label valueLabel;
+
+        public override void _Ready() {
+            titleLabel = GetNode<Label>("%Title");
+            valueLabel = GetNode<Label>("%Value");
+            if (_title != null) titleLabel.Text = _title;
+            if (_value != null) valueLabel.Text = _value;
+            ready = true;
+        }
+
+        protected void OnPropertyChanged(object sender, PropertyChangedEventArgs e) {
+            PropertyChanged?.Invoke(sender, e);
+        }
+
+    }
+}
diff --git a/Scenes/RightClickMenu/Sections/InfoSection.cs b/Scenes/RightClickMenu/Sections/InfoSection.cs
new file mode 100644
index 00000000..150de199
--- /dev/null
+++ b/Scenes/RightClickMenu/Sections/InfoSection.cs
@@ -0,0 +1,13 @@
+using Godot;
+using System;
+using System.Collections.Generic;
+
+namespace ConnectAPIC.Scenes.RightClickMenu.Sections {
+    public partial class InfoSection : ISection {
+        public void Initialize(String title, String value) {
+            Title = title;
+            Value = value;
+        }
+
+    }
+}
diff --git a/Scenes/RightClickMenu/Sections/SliderSection.cs b/Scenes/RightClickMenu/Sections/SliderSection.cs
new file mode 100644
index 00000000..bffe8a5d
--- /dev/null
+++ b/Scenes/RightClickMenu/Sections/SliderSection.cs
@@ -0,0 +1,86 @@
+using ConnectAPIC.Scripts.ViewModel;
+using Godot;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using YamlDotNet.Core.Tokens;
+
+namespace ConnectAPIC.Scenes.RightClickMenu.Sections {
+    public partial class SliderSection : ISection {
+        public HSlider Slider { get; private set; }
+        private Timer timer;
+        private float _minValue;
+        private float _maxValue;
+        public float MinValue {
+            get => _minValue;
+            set {
+                _minValue = value;
+                Slider.MinValue = value;
+            }
+        }
+        public float MaxValue {
+            get => _maxValue;
+            set {
+                _maxValue = value;
+                Slider.MaxValue = value;
+            }
+        }
+
+        /// <summary>
+        /// How often we notify slider value change while dragging
+        /// </summary>
+        public float SliderUpdateInterval { get; set; } = 0.1f;
+
+        bool sliding;
+        double prevValue;
+
+        public void Initialize(String title, Vector3 power, float minValue = 0, float maxValue = 1, float sliderUpdateInterval = 0.1f) {
+            Title = title;
+            Slider.Value = power.X + power.Y + power.Z; //power values should add up to max 1
+            if (IsNodeReady())
+                Value = Slider.Value.ToString();
+        }
+
+        public void Initialize(String title, float minValue = 0, float maxValue = 1, float sliderUpdateInterval = 0.1f) {
+            Title = title;
+            Slider.Value = MinValue;
+        }
+
+        public override void _Ready() {
+            Slider = GetNode<HSlider>("%Slider");
+            timer = GetNode<Timer>("%Timer");
+
+            timer.Timeout += () => {
+                if (prevValue != Slider.Value) {
+                    OnPropertyChanged(this, new PropertyChangedEventArgs(Slider.Value.ToString()));
+                    prevValue = Slider.Value;
+                }
+
+                if (sliding) timer.Start(SliderUpdateInterval);
+            };
+
+            Slider.DragStarted += () => {
+                prevValue = Slider.Value;
+                sliding = true;
+                timer.Start(SliderUpdateInterval);
+            };
+            Slider.DragEnded += (bool valueChanged) => {
+                sliding = false;
+                timer.Stop();
+                OnPropertyChanged(this, new PropertyChangedEventArgs(Slider.Value.ToString()));
+            };
+
+            base._Ready();
+        }
+
+        public void SetSliderValue(double value) {
+            Value = value.ToString("0.00");
+            Slider.Value = value;
+        }
+
+        public void SetSliderValue(Vector3 powerVector) {
+            float value = powerVector.Length();
+            SetSliderValue(value);
+        }
+    }
+}
diff --git a/Scenes/RightClickMenu/Sections/info_section.tscn b/Scenes/RightClickMenu/Sections/info_section.tscn
new file mode 100644
index 00000000..bd7dfab3
--- /dev/null
+++ b/Scenes/RightClickMenu/Sections/info_section.tscn
@@ -0,0 +1,54 @@
+[gd_scene load_steps=3 format=3 uid="uid://bibqhya7kmikv"]
+
+[ext_resource type="Script" path="res://Scenes/RightClickMenu/Sections/InfoSection.cs" id="1_jjdpd"]
+[ext_resource type="Theme" uid="uid://b2f4xgnx0xy5e" path="res://Scenes/Assets/Themes/MainTheme.tres" id="1_m86ur"]
+
+[node name="InfoSection" type="Control"]
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 3
+anchors_preset = 0
+mouse_filter = 1
+script = ExtResource("1_jjdpd")
+metadata/_edit_vertical_guides_ = [200.0]
+
+[node name="Title" type="Control" parent="."]
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 2
+anchors_preset = 0
+offset_right = 200.0
+offset_bottom = 20.0
+mouse_filter = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="Title"]
+layout_mode = 1
+offset_right = 2000.0
+offset_bottom = 205.0
+scale = Vector2(0.1, 0.1)
+theme_override_constants/margin_left = 60
+theme_override_constants/margin_top = 0
+theme_override_constants/margin_right = 60
+
+[node name="Title" type="Label" parent="Title/MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 0
+mouse_filter = 1
+theme = ExtResource("1_m86ur")
+text = "Title"
+
+[node name="MarginContainer2" type="MarginContainer" parent="Title"]
+layout_mode = 0
+offset_right = 2000.0
+offset_bottom = 205.0
+scale = Vector2(0.1, 0.1)
+theme_override_constants/margin_left = 60
+theme_override_constants/margin_top = 0
+theme_override_constants/margin_right = 60
+
+[node name="Value" type="Label" parent="Title/MarginContainer2"]
+unique_name_in_owner = true
+layout_mode = 2
+mouse_filter = 1
+theme = ExtResource("1_m86ur")
+text = "Value"
+horizontal_alignment = 2
diff --git a/Scenes/RightClickMenu/Sections/slider_section.tscn b/Scenes/RightClickMenu/Sections/slider_section.tscn
new file mode 100644
index 00000000..9b1780ba
--- /dev/null
+++ b/Scenes/RightClickMenu/Sections/slider_section.tscn
@@ -0,0 +1,74 @@
+[gd_scene load_steps=3 format=3 uid="uid://cbnwjaf2rjctr"]
+
+[ext_resource type="Theme" uid="uid://b2f4xgnx0xy5e" path="res://Scenes/Assets/Themes/MainTheme.tres" id="1_4u8fb"]
+[ext_resource type="Script" path="res://Scenes/RightClickMenu/Sections/SliderSection.cs" id="1_dehg3"]
+
+[node name="SliderSection" type="Control"]
+custom_minimum_size = Vector2(0, 50)
+layout_mode = 3
+anchors_preset = 0
+mouse_filter = 1
+script = ExtResource("1_dehg3")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/separation = 0
+
+[node name="Title" type="Control" parent="VBoxContainer"]
+custom_minimum_size = Vector2(0, 20)
+layout_mode = 2
+mouse_filter = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/Title"]
+layout_mode = 1
+offset_right = 415.0
+offset_bottom = 205.0
+scale = Vector2(0.1, 0.1)
+theme_override_constants/margin_left = 60
+theme_override_constants/margin_top = 0
+
+[node name="Title" type="Label" parent="VBoxContainer/Title/MarginContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+size_flags_horizontal = 0
+mouse_filter = 1
+theme = ExtResource("1_4u8fb")
+text = "Input Power:"
+
+[node name="Body" type="Control" parent="VBoxContainer"]
+custom_minimum_size = Vector2(0, 30)
+layout_mode = 2
+mouse_filter = 1
+
+[node name="Value" type="Label" parent="VBoxContainer/Body"]
+unique_name_in_owner = true
+layout_mode = 2
+offset_left = 6.0
+offset_top = -3.90996
+offset_right = 1706.0
+offset_bottom = 201.09
+scale = Vector2(0.1, 0.1)
+mouse_filter = 1
+theme = ExtResource("1_4u8fb")
+theme_override_colors/font_color = Color(0.588235, 0.588235, 0.588235, 0.811765)
+theme_override_colors/font_shadow_color = Color(0.137255, 0.137255, 0.137255, 0.784314)
+text = "Value"
+
+[node name="Slider" type="HSlider" parent="VBoxContainer/Body"]
+unique_name_in_owner = true
+layout_mode = 0
+offset_left = 4.0
+offset_top = 13.0
+offset_right = 195.0
+offset_bottom = 29.0
+mouse_filter = 1
+max_value = 1.0
+step = 0.01
+
+[node name="Timer" type="Timer" parent="."]
+unique_name_in_owner = true
diff --git a/Scenes/RightClickMenu/SimpleControlMenu.cs b/Scenes/RightClickMenu/SimpleControlMenu.cs
new file mode 100644
index 00000000..f4f77580
--- /dev/null
+++ b/Scenes/RightClickMenu/SimpleControlMenu.cs
@@ -0,0 +1,201 @@
+using CAP_Core.ExternalPorts;
+using ConnectAPic.LayoutWindow;
+using ConnectAPIC.Scenes.ExternalPorts;
+using ConnectAPIC.Scenes.RightClickMenu.Sections;
+using ConnectAPIC.Scripts.ViewModel;
+using ConnectAPIC.Scripts.ViewModel.Commands;
+using Godot;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace ConnectAPIC.Scenes.RightClickMenu {
+
+    public partial class SimpleControlMenu : Control {
+        [Export] public ButtonGroup ButtonGroup { get; set; }
+        [Export] public Curve animationCurve { get; set; }
+
+        public static float X_OFFSET = -120;    //Menus offset on X axis
+        public static float TRAVEL_TIME = 0.3f; //Time needed for menu to travel from one port to another
+
+        public PortsContainer PortsContainer { get; set; }
+
+        public Control InputMenu { get; set; }
+        private SliderSection sliderSection;
+        public Control OutputMenu { get; set; }
+        private InfoSection powerInfo;
+        private InfoSection phaseInfo;
+
+        private Godot.Collections.Array<BaseButton> portModeButtons;
+        private ExternalPortViewModel port;
+        private bool mouseOutsideClickArea = true;
+        private bool spawnInstantly = true;
+        private float targetOffsetY = -1;
+        private double time_tracked = 0;
+
+        public override void _Input(InputEvent @event) {
+            if (@event is InputEventMouseButton mouseButton
+                    && mouseButton.Pressed
+                    && mouseButton.ButtonIndex == MouseButton.Left
+                    && mouseOutsideClickArea) {
+                Visible = false;
+            }
+        }
+
+        public override void _Ready() {
+            InputMenu = GetNode<Control>("%InputMenu");
+            sliderSection = InputMenu.GetChild<SliderSection>(0);
+
+            OutputMenu = GetNode<Control>("%OutputMenu");
+            powerInfo = OutputMenu.GetChild<InfoSection>(0);
+            powerInfo.Title = "Power⚡";
+            powerInfo.Value = "0.00";
+            phaseInfo = OutputMenu.GetChild<InfoSection>(1);
+            phaseInfo.Title = "Phase Shift Φ";
+            phaseInfo.Value = "NaN";
+
+            if (ButtonGroup != null) {
+                portModeButtons = ButtonGroup.GetButtons();
+                foreach (BaseButton button in portModeButtons) {
+                    button.Pressed += () => Button_Pressed(button);
+                }
+            }
+
+            this.Visible = false;
+        }
+
+        public override void _Process(double delta) {
+            MoveToTargetOffsetIfNotThere(delta);
+        }
+
+        private void MoveToTargetOffsetIfNotThere(double delta) {
+            if (time_tracked < TRAVEL_TIME) {
+                float step = animationCurve.Sample((float)time_tracked / TRAVEL_TIME);
+                float yOffset = (float)Mathf.Lerp(Position.Y, targetOffsetY, step);
+                Position = new Vector2(X_OFFSET, yOffset);
+                time_tracked += delta;
+            }
+        }
+
+        private void Button_Pressed(BaseButton button) {
+            int index = portModeButtons.IndexOf(button);
+
+            if (index == 3) {
+                PortsContainer.inputOutputChangeCommand.ExecuteAsync(port).Wait();
+                return;
+            }
+
+            if (!port.IsInput)
+                PortsContainer.inputOutputChangeCommand.ExecuteAsync(port).Wait();
+
+            LaserType laserType = LaserType.Red;
+
+            if (index == 1)
+                laserType = LaserType.Green;
+            else if (index == 2)
+                laserType = LaserType.Blue;
+
+            PortsContainer.inputColorChangeCommand.ExecuteAsync(new InputColorChangeArgs(port.PortModel as ExternalInput, laserType)).Wait();
+        }
+
+        public void SetPortContainer(PortsContainer portsContainer) {
+            PortsContainer = portsContainer;
+        }
+
+        public void ConnectToPort(ExternalPortViewModel port) {
+            if (this.port == port) {
+                this.Visible = true;
+                return;
+            }
+
+            if (this.port != null) {
+                DisconnectFromPort();
+            }
+
+            this.port = port;
+
+            SetPortModeRadioButton(port);
+
+            SetSections(port.IsInput);
+
+            ConnectToSections(port);
+
+            targetOffsetY = (GameManager.TilePixelSize) * port.PortModel.TilePositionY;
+
+            if (spawnInstantly) {
+                Position = new Vector2(X_OFFSET, targetOffsetY);
+            }
+
+            spawnInstantly = false;
+            time_tracked = 0;
+            this.Visible = true;
+        }
+        public void DisconnectFromPort() {
+            this.Visible = false;
+            port.PropertyChanged -= Port_PropertyChanged;
+            sliderSection.PropertyChanged -= SliderSection_PropertyChanged;
+            port = null;
+        }
+
+        private void Port_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
+            if (e.PropertyName == nameof(ExternalPortViewModel.IsInput)) {
+                SetSections(port.IsInput);
+                portModeButtons[3].ButtonPressed = true;
+            } else if (e.PropertyName == nameof(ExternalPortViewModel.Power)
+                    || e.PropertyName == nameof(ExternalPortViewModel.Phase)) {
+                if (port.IsInput) {
+                    sliderSection.SetSliderValue(port.Power);
+                } else {
+                    SetInfoSections(port);
+                }
+            }
+            else if (e.PropertyName == nameof(ExternalPortViewModel.Color)) {
+                SetPortModeRadioButton(port);
+            }
+        }
+        private void SliderSection_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
+            PortsContainer.inputPowerAdjustCommand.ExecuteAsync(new InputPowerAdjustArgs(port.PortModel, sliderSection.Slider.Value)).Wait();
+        }
+
+        private void SetPortModeRadioButton(ExternalPortViewModel port) {
+            int index = 3; //3 is by default output button index
+            if (port.IsInput) {
+                if (port.Color == LaserType.Red)
+                    index = 0;
+                else if (port.Color == LaserType.Green)
+                    index = 1;
+                else
+                    index = 2;
+            }
+            portModeButtons[index].ButtonPressed = true;
+        }
+        public void SetSections(bool isInput) {
+            InputMenu.Visible = isInput;
+            OutputMenu.Visible = !isInput;
+        }
+        private void ConnectToSections(ExternalPortViewModel port) {
+            port.PropertyChanged += Port_PropertyChanged;
+            sliderSection.PropertyChanged += SliderSection_PropertyChanged;
+
+            if (port.IsInput)
+                sliderSection.SetSliderValue(port.Power);
+            else {
+                SetInfoSections(port);
+            }
+        }
+
+        private void SetInfoSections(ExternalPortViewModel port) {
+            powerInfo.Value = port.Power.Length().ToString("0.00");
+            phaseInfo.Value = port.Phase.ToString("0.00") + "°";
+        }
+
+        private void OnMouseEntered() {
+            mouseOutsideClickArea = false;
+        }
+        private void OnMouseExited() {
+            mouseOutsideClickArea = true;
+        }
+    }
+}
+
diff --git a/Scenes/RightClickMenu/TopBar.png b/Scenes/RightClickMenu/TopBar.png
deleted file mode 100644
index 87cf2f6d..00000000
Binary files a/Scenes/RightClickMenu/TopBar.png and /dev/null differ
diff --git a/Scripts/GameManager.cs b/Scripts/GameManager.cs
index 8d0aa881..42cd720a 100644
--- a/Scripts/GameManager.cs
+++ b/Scripts/GameManager.cs
@@ -26,8 +26,7 @@ namespace ConnectAPic.LayoutWindow
     [SuperNode(typeof(Provider))]
     public partial class GameManager : Node,
         IProvide<ToolBox>, IProvide<ILogger>, IProvide<GridView>, IProvide<GridManager>, IProvide<GridViewModel>, IProvide<GameManager>,
-        IProvide<GameConsole>, IProvide<System.Version>, IProvide<ComponentViewFactory>, IProvide<LightCalculationService>, IProvide<ToolViewModel>,
-        IProvide<LightManager>
+        IProvide<GameConsole>, IProvide<System.Version>, IProvide<ComponentViewFactory>, IProvide<LightCalculationService>, IProvide<ToolViewModel>
     {
         #region Dependency Injection
         public override partial void _Notification(int what);
@@ -35,7 +34,6 @@ public partial class GameManager : Node,
         ILogger IProvide<ILogger>.Value() => Logger;
         GridView IProvide<GridView>.Value() => GridView;
         GridManager IProvide<GridManager>.Value() => Grid;
-        LightManager IProvide<LightManager>.Value() => MyLightManager;
         GridViewModel IProvide<GridViewModel>.Value() => GridViewModel;
         ToolViewModel IProvide<ToolViewModel>.Value() => GridViewModel.ToolViewModel;
         GameManager IProvide<GameManager>.Value() => this;
@@ -59,7 +57,6 @@ public partial class GameManager : Node,
         public PortsContainer PortsContainer { get; set; }
         public static System.Version Version => Assembly.GetExecutingAssembly().GetName().Version; // Get the version from the assembly
         public GridManager Grid { get; set; }
-        public LightManager MyLightManager { get; private set; }
         public LightCalculationService LightCalculator { get; private set; }
         public ILogger Logger { get; set; }
         private LogSaver LogSaver { get; set; }
@@ -148,9 +145,8 @@ private void InitializeGridAndGridView(ComponentFactory componentFactory)
             GridView = GetNode<GridView>(GridViewPath);
             this.CheckForNull(x => GridView);
             Grid = new GridManager(FieldWidth, FieldHeight);
-            MyLightManager = new LightManager();
-            LightCalculator = new LightCalculationService(Grid, MyLightManager, new GridLightCalculator(new SystemMatrixBuilder(Grid), Grid));
-            GridViewModel = new GridViewModel( Grid, Logger, componentFactory, LightCalculator, MyLightManager);
+            LightCalculator = new LightCalculationService(Grid, new GridLightCalculator(new SystemMatrixBuilder(Grid), Grid));
+            GridViewModel = new GridViewModel( Grid, Logger, componentFactory, LightCalculator);
             GridView.Initialize(GridViewModel, Logger);
             InitializationLogs.Add(("Initialized GridView and Grid and GridViewModel", false));
         }
diff --git a/Scripts/View/ExternalPortViews/ExternalPortView.cs b/Scripts/View/ExternalPortViews/ExternalPortView.cs
index 84871d97..ec9bfc8a 100644
--- a/Scripts/View/ExternalPortViews/ExternalPortView.cs
+++ b/Scripts/View/ExternalPortViews/ExternalPortView.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using ConnectAPIC.Scenes.RightClickMenu;
 
 
 namespace ConnectAPIC.Scenes.ExternalPorts
@@ -13,8 +14,6 @@ public partial class ExternalPortView : Node2D
         [Export] public Texture2D InputTexture { set; get; }
         [Export] public Texture2D OutputTexture { set; get; }
 
-        public event EventHandler RightClicked;
-
         public ExternalPortViewModel ViewModel { get; set; }
 
         List<PointLight2D> lightContainer;
@@ -24,7 +23,7 @@ public partial class ExternalPortView : Node2D
         float pulseValue = 0;
         float minPulseEnergy = 0.8f;
         float maxPulseEnergy = 1.2f;
-        bool mouseInRightClickArea = false;
+        bool mouseInClickArea = false;
 
         public void Initialize(ExternalPortViewModel viewModel)
         {
@@ -45,10 +44,10 @@ public override void _Input(InputEvent @event)
         {
             if (@event is InputEventMouseButton mouseButton
                 && mouseButton.Pressed
-                && mouseButton.ButtonIndex == MouseButton.Right
-                && mouseInRightClickArea)
+                && mouseButton.ButtonIndex == MouseButton.Left
+                && mouseInClickArea)
             {
-                RightClicked.Invoke(this, EventArgs.Empty);
+                ViewModel.InvokeClicked();
             }
         }
 
@@ -63,6 +62,8 @@ public override void _Process(double delta)
         public void SetAsOutput()
         {
             currentTexture.Texture = OutputTexture;
+            InfoLabel.Text = ViewModel.AllColorsPower();
+            InfoLabel.Visible = true;
             SetLight(false);
         }
 
@@ -70,6 +71,7 @@ public void SetAsInput(float alpha = 1)
         {
             currentTexture.Texture = InputTexture;
             pulseValue = (float)(new Random().NextDouble() * 10);
+            InfoLabel.Visible = false;
             SetLightColor(alpha);
             SetLight(ViewModel.IsLightOn);
         }
@@ -128,19 +130,15 @@ private void ViewModel_PropertyChanged(object sender, System.ComponentModel.Prop
             }
         }
 
-
         private void OnMouseEnteredRightClickArea()
         {
-            mouseInRightClickArea = true;
+            mouseInClickArea = true;
         }
 
-
         private void OnMouseExitedRightClickArea()
         {
-            mouseInRightClickArea = false;
+            mouseInClickArea = false;
         }
-
-
     }
 }
 
diff --git a/Scripts/View/ExternalPortViews/ExternalPortViewFactory.cs b/Scripts/View/ExternalPortViews/ExternalPortViewFactory.cs
index 8a3f5e9c..a5a36ec6 100644
--- a/Scripts/View/ExternalPortViews/ExternalPortViewFactory.cs
+++ b/Scripts/View/ExternalPortViews/ExternalPortViewFactory.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System;
 using Godot;
+using ConnectAPIC.Scripts.ViewModel;
 
 namespace ConnectAPic.LayoutWindow
 {
@@ -14,20 +15,23 @@ public class ExternalPortViewFactory
         public PortsContainer PortsContainer{ get; set; }
         public GridManager Grid {  get; set; }
         public LightCalculationService LightCalculator { get; set; }
-        public LightManager LightManager { get; }
 
-        public ExternalPortViewFactory(PortsContainer portsContainer, GridManager grid, LightCalculationService lightCalculator, LightManager lightManager)
+        public ExternalPortViewFactory(PortsContainer portsContainer, GridManager grid, LightCalculationService lightCalculator)
         {
             PortsContainer = portsContainer;
             LightCalculator = lightCalculator;
-            LightManager = lightManager;
             Grid = grid;
         }
 
-        public ExternalPortView InitializeExternalPortView(ExternalPort externalPort)
+        /// <summary>
+        /// Initializes port view and view model corresponding to given external port model
+        /// </summary>
+        /// <param name="externalPort">External port model for which view and view model is created</param>
+        /// <returns>View model for given external port</returns>
+        public ExternalPortViewModel InitializeExternalPortView(ExternalPort externalPort)
         {
             ExternalPortView portView = PortsContainer.ExternalPortViewTemplate.Instantiate<ExternalPortView>();
-            ExternalPortViewModel portViewModel = new ExternalPortViewModel(Grid, LightManager, externalPort.TilePositionY, LightCalculator);
+            ExternalPortViewModel portViewModel = new ExternalPortViewModel(Grid, externalPort, LightCalculator);
 
             portView.Initialize(portViewModel);
 
@@ -56,20 +60,25 @@ public ExternalPortView InitializeExternalPortView(ExternalPort externalPort)
             portView.Visible = true;
             portView.Position = new Vector2(0, (GameManager.TilePixelSize) * externalPort.TilePositionY);
             PortsContainer.AddChild(portView);
-            return portView;
+            return portViewModel;
         }
-    
-        public List<ExternalPortView> InitializeExternalPortViewList(ObservableCollection<ExternalPort> ExternalPorts)
+
+        /// <summary>
+        /// Initializes list of port views and view models corresponding to the input list (ExternalPorts) of port models
+        /// </summary>
+        /// <param name="ExternalPorts">List of external port models</param>
+        /// <returns>List of external port view models each connected to port models from the input list</returns>
+        public List<ExternalPortViewModel> InitializeExternalPortViewList(ObservableCollection<ExternalPort> ExternalPorts)
             {
-                List<ExternalPortView> portViews = new();
+                List<ExternalPortViewModel> portViewModels = new();
                 foreach (var port in ExternalPorts)
                 {
-                    portViews.Add(
+                    portViewModels.Add(
                         InitializeExternalPortView(port)
                         );
                 }
 
-                return portViews;
+                return portViewModels;
             }
     }
 }
diff --git a/Scripts/View/GUIControls/MainCamera.cs b/Scripts/View/GUIControls/MainCamera.cs
index 5570a1a6..fa08e29b 100644
--- a/Scripts/View/GUIControls/MainCamera.cs
+++ b/Scripts/View/GUIControls/MainCamera.cs
@@ -1,4 +1,5 @@
 using Godot;
+using JetBrains.Annotations;
 using System;
 
 public partial class MainCamera : Camera2D
@@ -9,10 +10,12 @@ public partial class MainCamera : Camera2D
     [Export] public float MaxZoomIn { get; set; } = 2.7f;
     [Export] public float PanSensitivity { get; set; } = 1f;
 
+    public bool noZoomingOrMoving = false;
 
     public override void _Input(InputEvent @event)
     {
-        
+        if (noZoomingOrMoving) return;
+
         if(@event is InputEventMouseMotion && Input.IsMouseButtonPressed(MouseButton.Right))
         {
             Position -= ((InputEventMouseMotion)@event).Relative * PanSensitivity / Zoom;
@@ -38,6 +41,7 @@ public override void _Ready()
     
     
     public void ZoomCamera(int direction){
+        //if (noZoomingOrMoving) return;
         Vector2 previousMousePosition = GetLocalMousePosition();
         
         Zoom += Zoom * ZoomSpeed * direction;
@@ -45,4 +49,12 @@ public void ZoomCamera(int direction){
         
         Offset += previousMousePosition - GetLocalMousePosition();
     }
+
+    private void OnMouseEnteredTutorialWindow() {
+        noZoomingOrMoving = true;
+    }
+    private void OnMouseExitedTutorialWindow() {
+        noZoomingOrMoving = false;
+    }
 }
+
diff --git a/Scripts/ViewModel/Commands/InputColorChangeCommand.cs b/Scripts/ViewModel/Commands/InputColorChangeCommand.cs
new file mode 100644
index 00000000..576c0fb5
--- /dev/null
+++ b/Scripts/ViewModel/Commands/InputColorChangeCommand.cs
@@ -0,0 +1,66 @@
+using CAP_Core.ExternalPorts;
+using CAP_Core.Grid;
+using Godot;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConnectAPIC.Scripts.ViewModel.Commands
+{
+    public class InputColorChangeCommand : ICommand
+    {
+        public GridManager Grid { get; }
+
+        public InputColorChangeCommand(GridManager grid)
+        {
+            Grid = grid;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            InputColorChangeArgs inputParams = parameter as InputColorChangeArgs;
+            if (inputParams == null || inputParams.LaserColor == null) return false;
+
+            return Grid.ExternalPortManager.ExternalPorts.Contains(inputParams.Port);
+        }
+
+        public async Task ExecuteAsync(object parameter)
+        {
+            if (!CanExecute(parameter)) return;
+
+            InputColorChangeArgs args = parameter as InputColorChangeArgs;
+
+            args.Port.LaserType = args.LaserColor;
+
+            //easy way to recalculate light
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+        }
+    }
+
+    public class InputColorChangeArgs
+    {
+        public InputColorChangeArgs(ExternalInput port, String colorString)
+        {
+            Port = port;
+            switch (colorString.ToLower()) {
+                case "red": LaserColor = LaserType.Red; break;
+                case "green": LaserColor = LaserType.Green; break;
+                case "blue": LaserColor = LaserType.Blue; break;
+            }
+        }
+
+        public InputColorChangeArgs(ExternalInput port, LaserType laserColor)
+        {
+            Port = port;
+            LaserColor = laserColor;
+        }
+
+        public ExternalInput Port { get; }
+        public LaserType LaserColor { get; }
+    }
+}
diff --git a/Scripts/ViewModel/Commands/InputOutputChangeCommand.cs b/Scripts/ViewModel/Commands/InputOutputChangeCommand.cs
new file mode 100644
index 00000000..29bc9798
--- /dev/null
+++ b/Scripts/ViewModel/Commands/InputOutputChangeCommand.cs
@@ -0,0 +1,52 @@
+using CAP_Core.ExternalPorts;
+using CAP_Core.Grid;
+using Godot;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConnectAPIC.Scripts.ViewModel.Commands
+{
+    public class InputOutputChangeCommand : ICommand
+    {
+        public GridManager Grid { get; }
+
+        public InputOutputChangeCommand(GridManager grid)
+        {
+            Grid = grid;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            ExternalPortViewModel ViewModel = parameter as ExternalPortViewModel;
+            if (ViewModel == null) return false;
+
+            return Grid.ExternalPortManager.ExternalPorts.Contains(ViewModel.PortModel);
+        }
+
+        public async Task ExecuteAsync(object parameter)
+        {
+            if (!CanExecute(parameter)) return;
+            ExternalPortViewModel ViewModel = parameter as ExternalPortViewModel;
+
+            ExternalPort newPort;
+            ExternalPort port = ViewModel.PortModel;
+            int index = Grid.ExternalPortManager.ExternalPorts.IndexOf(port);
+
+            if (port is ExternalInput)
+                newPort = new ExternalOutput(port.PinName, port.TilePositionY);
+            else
+                newPort = new ExternalInput(port.PinName, LaserType.Red, port.TilePositionY, 1);
+
+            ViewModel.PortModel = newPort;
+            Grid.ExternalPortManager.ExternalPorts[index] = newPort;
+
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+        }
+    }
+}
diff --git a/Scripts/ViewModel/Commands/InputPowerAdjustCommand.cs b/Scripts/ViewModel/Commands/InputPowerAdjustCommand.cs
new file mode 100644
index 00000000..7c8b3cbe
--- /dev/null
+++ b/Scripts/ViewModel/Commands/InputPowerAdjustCommand.cs
@@ -0,0 +1,57 @@
+using CAP_Core.ExternalPorts;
+using CAP_Core.Grid;
+using Godot;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConnectAPIC.Scripts.ViewModel.Commands
+{
+    public class InputPowerAdjustCommand : ICommand
+    {
+        public GridManager Grid { get; }
+
+        public InputPowerAdjustCommand(GridManager grid)
+        {
+            Grid = grid;
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            InputPowerAdjustArgs inputParams = parameter as InputPowerAdjustArgs;
+            if (inputParams == null || inputParams.PowerValue < 0 || inputParams.PowerValue > 1) return false;
+
+            return Grid.ExternalPortManager.ExternalPorts.Contains(inputParams.Port) && inputParams.Port is ExternalInput;
+
+        }
+        public async Task ExecuteAsync(object parameter)
+        {
+            if (!CanExecute(parameter)) return;
+
+            InputPowerAdjustArgs args = (InputPowerAdjustArgs)parameter;
+            ExternalInput input = args.Port as ExternalInput;
+
+            input.InFlowPower = args.PowerValue;
+
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+            Grid.LightManager.IsLightOn = !Grid.LightManager.IsLightOn;
+        }
+        
+    }
+
+    public class InputPowerAdjustArgs
+    {
+        public InputPowerAdjustArgs(ExternalPort port, double powerValue)
+        {
+            Port = port;
+            PowerValue = powerValue;
+        }
+
+        public ExternalPort Port { get; }
+        public double PowerValue { get; }
+    }
+}
diff --git a/Scripts/ViewModel/ExternalPortViewModel.cs b/Scripts/ViewModel/ExternalPortViewModel.cs
index e2af9589..ce62e548 100644
--- a/Scripts/ViewModel/ExternalPortViewModel.cs
+++ b/Scripts/ViewModel/ExternalPortViewModel.cs
@@ -2,82 +2,166 @@
 using CAP_Core.ExternalPorts;
 using CAP_Core.Grid;
 using CAP_Core.LightCalculation;
+using Godot;
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Numerics;
 using System.Runtime.CompilerServices;
 
 
-public class ExternalPortViewModel : INotifyPropertyChanged
+namespace ConnectAPIC.Scripts.ViewModel
 {
-    public GridManager Grid { get; }
-    public LightCalculationService LightCalculator { get; }
+    public class ExternalPortViewModel : INotifyPropertyChanged
+    {
+        public event EventHandler Clicked;
+        public void InvokeClicked() => Clicked.Invoke(this, EventArgs.Empty);
+
+        public GridManager Grid { get; }
+        public LightCalculationService LightCalculator { get; }
+
+        private ExternalPort _portModel;
+        public ExternalPort PortModel
+        {
+            get => _portModel;
+            set
+            {
+                if (_portModel != null)
+                    _portModel.PropertyChanged -= Model_PropertyChanged;
+                _portModel = value;
+                _portModel.PropertyChanged += Model_PropertyChanged;
+
+                IsInput = (value is ExternalInput);
 
-    public int TilePositionY { get; private set; } = -1;
+                ExternalInput tmp = (value as ExternalInput);
+                if (tmp != null)
+                {
+                    ResetInputPowerAndColorUsingLaserType(tmp.LaserType, tmp.InFlowPower.Real);
+                }
 
-    private bool _isInput;
-    public bool IsInput {
-        get => _isInput;
-        set{
-            _isInput = value;
-            OnPropertyChanged();
+                OnPropertyChanged();
+            }
         }
-    }
 
-    private bool _isLightOn;
-    public bool IsLightOn
-    {
-        get { return _isLightOn; }
-        set
+        public int TilePositionY
+        {
+            get;
+            private set;
+        } = -1;
+
+        private bool _isInput;
+        public bool IsInput
         {
-            _isLightOn = value;
-            OnPropertyChanged();
+            get => _isInput;
+            set
+            {
+                _isInput = value;
+                OnPropertyChanged();
+            }
         }
-    }
 
-    private Vector3 _power;
-    public Vector3 Power
-    {
-        get => _power;
-        set
+        private bool _isLightOn;
+        public bool IsLightOn
         {
-            _power = value;
-            OnPropertyChanged();
+            get { return _isLightOn; }
+            set
+            {
+                _isLightOn = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private LaserType _color;
+        public LaserType Color {
+            get => _color;
+            set
+            {
+                _color = value;
+                OnPropertyChanged();
+            }
         }
-    }
 
-    public event PropertyChangedEventHandler PropertyChanged;
+        private Vector3 _power;
+        public Vector3 Power
+        {
+            get => _power;
+            set
+            {
+                _power = value;
+                OnPropertyChanged();
+            } 
+        }
 
-    public ExternalPortViewModel(GridManager grid, LightManager lightManager, int tilePositionY, LightCalculationService lightCalculator)
-    {
-        LightCalculator = lightCalculator;
-        TilePositionY = tilePositionY;
-        Power = Vector3.Zero;
-        Grid = grid;
+        private float _phase;
+        public float Phase {
+            get => _phase;
+            set {
+                _phase = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
 
-        lightManager.OnLightSwitched += (object sender, bool e) =>
+        public ExternalPortViewModel(GridManager grid, ExternalPort externalPort, LightCalculationService lightCalculator)
         {
-            IsLightOn = e;
-            if (!IsLightOn && !IsInput)
+            LightCalculator = lightCalculator;
+            PortModel = externalPort;
+            Power = Vector3.Zero;
+            Grid = grid;
+
+            Grid.LightManager.OnLightSwitched += (object sender, bool e) =>
             {
-                //for some reason when light turns off LightCalculationChanged signal isn't emitted
-                ResetPowers();
+                IsLightOn = e;
+                if (!IsLightOn && !IsInput)
+                {
+                    //for some reason when light turns off LightCalculationChanged signal isn't emitted
+                    ResetPowers();
+                }
+            };
+
+            lightCalculator.LightCalculationChanged += ResetPowerMeterDisplay;
+        }
+
+
+
+
+        public string AllColorsPower()
+        {
+            string allUsedPowers = "";
+
+            if (Power.X > 0.005)
+            {
+                allUsedPowers += $"[color=#FF4444]R: {Power.X:F2}[/color]\n";
+            }
+            if (Power.Y > 0.005)
+            {
+                allUsedPowers += $"[color=#44FF44]G: {Power.Y:F2}[/color]\n";
+            }
+            if (Power.Z > 0.005)
+            {
+                allUsedPowers += $"[color=#4444FF]B: {Power.Z:F2}[/color]";
             }
-        };
 
-        lightCalculator.LightCalculationChanged += (object sender, LightCalculationChangeEventArgs e) =>
+            // Removes the trailing newline character if any colors were added
+            return allUsedPowers.TrimEnd('\n');
+        }
+        private void ResetPowers()
+        {
+            Power = Vector3.Zero;
+        }
+
+        private void ResetPowerMeterDisplay(object sender, LightCalculationChangeEventArgs e)
         {
             if (IsInput) return;
-            var touchingComponent = Grid.ComponentMover.GetComponentAt(0, TilePositionY);
+            var touchingComponent = Grid.ComponentMover.GetComponentAt(0, PortModel.TilePositionY);
             if (touchingComponent == null)
             {
                 ResetPowers();
                 return;
             };
-            var offsetY = TilePositionY - touchingComponent.GridYMainTile;
+            var offsetY = PortModel.TilePositionY - touchingComponent.GridYMainTile;
             var touchingPin = touchingComponent.PinIdLeftOut(0, offsetY);
             if (touchingPin == null)
             {
@@ -85,54 +169,55 @@ public ExternalPortViewModel(GridManager grid, LightManager lightManager, int ti
                 return;
             };
             var fieldOut = e.LightFieldVector[(Guid)touchingPin].Magnitude;
-            var power = _power;
-            if (e.LaserInUse.Color == LightColor.Red)
-            {
-                // floats should be sufficient for this value
-                power.X = (float)(fieldOut * fieldOut);
-            }
-            else if (e.LaserInUse.Color == LightColor.Green)
-            {
-                power.Y = (float)(fieldOut * fieldOut);
-            }
-            else
-            {
-                power.Z = (float)(fieldOut * fieldOut);
-            }
-            Power = power;
-        };
-    }
-
-
-    public string AllColorsPower()
-    {
-        string allUsedPowers = "";
+            Phase = Mathf.RadToDeg((float)e.LightFieldVector[(Guid)touchingPin].Phase + 2*Mathf.Pi)%360;
+            UpdateInputPowerAndColorUsingLaserType(e.LaserInUse, (float)(fieldOut * fieldOut));
+        }
 
-        if (Power.X > 0.005)
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
         {
-            allUsedPowers += $"[color=#FF4444]R: {Power.X:F2}[/color]\n";
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
-        if (Power.Y > 0.005)
+        private void Model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            allUsedPowers += $"[color=#44FF44]G: {Power.Y:F2}[/color]\n";
+            //only external inputs gives away meaningful property change signals
+            ExternalInput inputPort = PortModel as ExternalInput;
+            if (inputPort == null) return;
+
+            if (e.PropertyName == nameof(ExternalInput.LaserType)
+             || e.PropertyName == nameof(ExternalInput.InFlowPower))
+            {
+                var inputPower = inputPort.InFlowPower.Real;
+                ResetInputPowerAndColorUsingLaserType(inputPort.LaserType, inputPower);
+            }
         }
-        if (Power.Z > 0.005)
+
+        private void UpdateInputPowerAndColorUsingLaserType(LaserType laserType, double inputPower)
         {
-            allUsedPowers += $"[color=#4444FF]B: {Power.Z:F2}[/color]";
+            SetPowerAndColorUsingLaserType(laserType, inputPower, Power);
         }
 
-        // Removes the trailing newline character if any colors were added
-        return allUsedPowers.TrimEnd('\n');
-    }
-    private void ResetPowers()
-    {
-        Power = Vector3.Zero;
-    }
+        private void ResetInputPowerAndColorUsingLaserType(LaserType laserType, double inputPower)
+        {
+            SetPowerAndColorUsingLaserType(laserType, inputPower, Vector3.Zero);
+        }
 
-    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = "")
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        private void SetPowerAndColorUsingLaserType(LaserType laserType, double inputPower, Vector3 startValue)
+        {
+            var power = startValue;
+            if (laserType == LaserType.Red)
+            {
+                power.X = (float)inputPower;
+            }
+            else if (laserType == LaserType.Green)
+            {
+                power.Y = (float)inputPower;
+            }
+            else
+            {
+                power.Z = (float)inputPower;
+            }
+            Color = laserType;
+            Power = power;
+        }
     }
-
 }
-
diff --git a/Scripts/ViewModel/GridViewModel.cs b/Scripts/ViewModel/GridViewModel.cs
index a9e92271..157e0f94 100644
--- a/Scripts/ViewModel/GridViewModel.cs
+++ b/Scripts/ViewModel/GridViewModel.cs
@@ -47,13 +47,13 @@ public bool IsLightOn {
 
         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
 
-        public GridViewModel( GridManager grid, ILogger logger, ComponentFactory componentModelFactory, LightCalculationService lightCalculator , LightManager lightManager)
+        public GridViewModel( GridManager grid, ILogger logger, ComponentFactory componentModelFactory, LightCalculationService lightCalculator )
         {
             this.Grid = grid;
             LightCalculator = lightCalculator;
             Logger = logger;
             this.ComponentModelFactory = componentModelFactory;
-            this.LightManager = lightManager;
+            LightManager = grid.LightManager;
             this.LightManager.OnLightSwitched += (object sender, bool e) => IsLightOn = e;
             CreateComponentCommand = new CreateComponentCommand(grid, componentModelFactory);
             SelectionGroupManager = new(this, new SelectionManager(grid));
@@ -62,7 +62,7 @@ public GridViewModel( GridManager grid, ILogger logger, ComponentFactory compone
             LoadGridCommand = new LoadGridCommand(grid, new FileDataAccessor(), componentModelFactory, this);
             MoveSliderCommand = new MoveSliderCommand(grid);
             ExportToNazcaCommand = new ExportNazcaCommand(new NazcaExporter(), grid, new DataAccessorGodot());
-            SwitchOnLightCommand = new SwitchOnLightCommand(lightManager);
+            SwitchOnLightCommand = new SwitchOnLightCommand(grid.LightManager);
             DeleteComponentCommand = new DeleteComponentCommand(grid);
             
 
diff --git a/UnitTests/ViewModels/Commands/MoveComponentCommandTests.cs b/UnitTests/ViewModels/Commands/MoveComponentCommandTests.cs
index cfe09970..da28b073 100644
--- a/UnitTests/ViewModels/Commands/MoveComponentCommandTests.cs
+++ b/UnitTests/ViewModels/Commands/MoveComponentCommandTests.cs
@@ -21,11 +21,12 @@ public MoveComponentCommandTests()
         {
             // IExternalPortManager externalPortManager, IComponentRotator componentRotator, IComponentRelationshipManager componentRelationshipManager
             var tileMgr = new TileManager(24, 12);
+            var lightMgr = new LightManager();
             var componentMover = new Mock<IComponentMover>();
             var externalPortMgr = new Mock<IExternalPortManager>();
             var componentRotator = new Mock<IComponentRotator>();
             var componentRelationshipMgr = new Mock<IComponentRelationshipManager>();
-            gridManagerMock = new Mock<GridManager>(tileMgr, componentMover.Object, externalPortMgr.Object,componentRotator.Object,componentRelationshipMgr.Object);
+            gridManagerMock = new Mock<GridManager>(tileMgr, componentMover.Object, externalPortMgr.Object,componentRotator.Object,componentRelationshipMgr.Object, lightMgr);
             selectionManagerMock = new Mock<SelectionManager>(gridManagerMock.Object);
             command = new MoveComponentCommand(gridManagerMock.Object, selectionManagerMock.Object);
 
diff --git a/cspell.json b/cspell.json
index d6eb8eaa..a9f06363 100644
--- a/cspell.json
+++ b/cspell.json
@@ -27,7 +27,8 @@
     "cspell.json",
     "*.json",
     "*.md",
-    "*.psd"
+    "*.psd",
+    "*.ogv"
   ],
     "words": [
         "Behaviour",