diff --git a/Views/AIGenerationWindow.axaml b/Views/AI/AIGenerationWindow.axaml
similarity index 100%
rename from Views/AIGenerationWindow.axaml
rename to Views/AI/AIGenerationWindow.axaml
diff --git a/Views/AIGenerationWindow.axaml.cs b/Views/AI/AIGenerationWindow.axaml.cs
similarity index 100%
rename from Views/AIGenerationWindow.axaml.cs
rename to Views/AI/AIGenerationWindow.axaml.cs
diff --git a/Views/ImageProcessingWindow.axaml b/Views/AI/ImageProcessingWindow.axaml
similarity index 100%
rename from Views/ImageProcessingWindow.axaml
rename to Views/AI/ImageProcessingWindow.axaml
diff --git a/Views/ImageProcessingWindow.cs b/Views/AI/ImageProcessingWindow.cs
similarity index 100%
rename from Views/ImageProcessingWindow.cs
rename to Views/AI/ImageProcessingWindow.cs
diff --git a/Views/AboutWindow.axaml b/Views/About/AboutWindow.axaml
similarity index 100%
rename from Views/AboutWindow.axaml
rename to Views/About/AboutWindow.axaml
diff --git a/Views/AboutWindow.axaml.cs b/Views/About/AboutWindow.axaml.cs
similarity index 100%
rename from Views/AboutWindow.axaml.cs
rename to Views/About/AboutWindow.axaml.cs
diff --git a/Views/ComponentPropertiesView.axaml b/Views/Components/ComponentPropertiesView.axaml
similarity index 100%
rename from Views/ComponentPropertiesView.axaml
rename to Views/Components/ComponentPropertiesView.axaml
diff --git a/Views/ComponentPropertiesView.axaml.cs b/Views/Components/ComponentPropertiesView.axaml.cs
similarity index 100%
rename from Views/ComponentPropertiesView.axaml.cs
rename to Views/Components/ComponentPropertiesView.axaml.cs
diff --git a/Views/OtherComponentsWindow.axaml b/Views/Components/OtherComponentsWindow.axaml
similarity index 100%
rename from Views/OtherComponentsWindow.axaml
rename to Views/Components/OtherComponentsWindow.axaml
diff --git a/Views/OtherComponentsWindow.axaml.cs b/Views/Components/OtherComponentsWindow.axaml.cs
similarity index 100%
rename from Views/OtherComponentsWindow.axaml.cs
rename to Views/Components/OtherComponentsWindow.axaml.cs
diff --git a/Views/ExportComponentWindow.axaml b/Views/Export/ExportComponentWindow.axaml
similarity index 100%
rename from Views/ExportComponentWindow.axaml
rename to Views/Export/ExportComponentWindow.axaml
diff --git a/Views/ExportComponentWindow.axaml.cs b/Views/Export/ExportComponentWindow.axaml.cs
similarity index 100%
rename from Views/ExportComponentWindow.axaml.cs
rename to Views/Export/ExportComponentWindow.axaml.cs
diff --git a/Views/MainWindow.axaml b/Views/Main/MainWindow.axaml
similarity index 97%
rename from Views/MainWindow.axaml
rename to Views/Main/MainWindow.axaml
index 807cdb3..bbcb135 100644
--- a/Views/MainWindow.axaml
+++ b/Views/Main/MainWindow.axaml
@@ -1,303 +1,303 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="using:IRis.ViewModels"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:ui="using:FluentAvalonia.UI.Controls"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="IRis.Views.MainWindow"
-        x:DataType="vm:MainWindowViewModel"
-        Icon="/Assets/avalonia-logo.ico"
-        Title="IRis">
-
-    <Design.DataContext>
-        <!-- This only sets the DataContext for the previewer in an IDE,
-             to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
-        <vm:MainWindowViewModel />
-    </Design.DataContext>
-
-    <Window.KeyBindings>
-         
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[SaveFile]}" 
-                    Command="{Binding SaveCommand}"/>
-        
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[OpenFile]}" 
-                    Command="{Binding OpenCommand}"/>
-
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[NewFile]}" 
-                    Command="{Binding NewCommand}"/>
-       
-       
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Delete]}" 
-                    Command="{Binding DeleteCommand}" />
-        
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Unselect]}" 
-                    Command="{Binding AddComponentCommand}" 
-                    CommandParameter="NULL"/>
-        
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[OtherComponents]}" 
-                    Command="{Binding OtherComponentsCommand}"/>
-
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Copy]}" 
-                    Command="{Binding CopyCommand}"/>
-        
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Cut]}" 
-                    Command="{Binding CutCommand}"/>
-
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Paste]}" 
-                    Command="{Binding PasteCommand}"/>
-
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Undo]}" 
-                    Command="{Binding UndoCommand}"/>
-
-        <KeyBinding Gesture="{Binding KeyConfig.Entries[Redo]}" 
-                    Command="{Binding RedoCommand}"/>
-        
-        
-        <!-- <KeyBinding Gesture="{Binding KeyConfig.Entries[RotateClockwise]}"  -->
-        <!--             Command="{Binding RotatePreviewCompCommand}" -->
-        <!--             CommandParameter="C"/> -->
-        <!-- <KeyBinding Gesture="{Binding KeyConfig.Entries[RotateCounterClockwise]}"  -->
-        <!--             Command="{Binding RotatePreviewCompCommand}" -->
-        <!--             CommandParameter="AC"/> -->
-    </Window.KeyBindings>
-
-
-
-    <DockPanel>
-        <!-- Top Menu Bar -->
-        <!-- Top Menu Bar -->
-        <Menu DockPanel.Dock="Top">
-            <MenuItem Header="File" >
-
-                <MenuItem Header="New"
-                          Command="{Binding NewCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[NewFile]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource new_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Open..."
-                          Command="{Binding OpenCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[OpenFile]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource open_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Save"
-                          Command="{Binding SaveCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[SaveFile]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource save_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Save As..." Command="{Binding SaveAsCommand}" />
-
-                <Separator />
-                <MenuItem Header="Export" >
-                    
-                    <MenuFlyout></MenuFlyout>
-                        <MenuItem Header="Component" Command="{Binding ExportComponentCommand}" />
-                        <MenuItem Header="Circuit" Command="{Binding ExportCircuitCommand}" />
-                    
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource arrow_export_rtl_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator />
-
-                <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
-            </MenuItem>
-
-            <MenuItem Header="Edit">
-                <MenuItem Header="Undo"
-                          Command="{Binding UndoCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Undo]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource arrow_undo_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Redo"
-                          Command="{Binding RedoCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Redo]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource arrow_redo_regular}"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <Separator />
-
-                <MenuItem Header="Cut"
-                          Command="{Binding CutCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Cut]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource cut_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Copy"
-                          Command="{Binding CopyCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Copy]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource copy_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Paste"
-                          Command="{Binding PasteCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Paste]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource clipboard_paste_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem Header="Delete"
-                          Command="{Binding DeleteCommand}"
-                          InputGesture="{Binding KeyConfig.Entries[Delete]}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource delete_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-            <!-- AI option -->
-            <MenuItem Header="AI">
-                <MenuItem
-                    Header="Generate From Prompt"
-                    Command="{Binding AiPromptCommand}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource star_emphasis_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-                <MenuItem
-                    Header="Generate From Image"
-                    Command="{Binding AiImageCommand}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource image_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-
-            </MenuItem>
-
-            <MenuItem Header="Help">
-                <MenuItem Header="About" Command="{Binding AboutCommand}">
-                    <MenuItem.Icon>
-                        <PathIcon Data="{StaticResource question_regular}" />
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
-        </Menu>
-
-
-        <!-- Left Sidebar with Components -->
-        <ScrollViewer DockPanel.Dock="Left" Width="150" BorderThickness="2">
-            <StackPanel Margin="5" Spacing="5">
-                <TextBlock Text="Components" FontWeight="Bold" Margin="0,5" />
-
-                <Button Content="AND Gate" Command="{Binding AddComponentCommand}" CommandParameter="AND" />
-                <Button Content="OR Gate" Command="{Binding AddComponentCommand}" CommandParameter="OR" />
-                <Button Content="NOT Gate" Command="{Binding AddComponentCommand}" CommandParameter="NOT" />
-                <Button Content="NAND Gate" Command="{Binding AddComponentCommand}" CommandParameter="NAND" />
-                <Button Content="NOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="NOR" />
-                <Button Content="XOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="XOR" />
-                <Button Content="XNOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="XNOR" />
-                <Button Content="Other" Command="{Binding OtherComponentsCommand}" />
-
-                <TextBlock Text="Input/Output" FontWeight="Bold" Margin="0,10,0,5" />
-
-                <Button Content="Toggle Switch" Command="{Binding AddComponentCommand}" CommandParameter="TOGGLE" />
-                <Button Content="Logic Probe" Command="{Binding AddComponentCommand}" CommandParameter="PROBE" />
-
-                <TextBlock Text="Connectors" FontWeight="Bold" Margin="0,10,0,5" />
-
-                <Button Content="Wire" Command="{Binding AddComponentCommand}" CommandParameter="WIRE" />
-
-            </StackPanel>
-        </ScrollViewer>
-
-        <!-- Top Bar: Toolbar below menu -->
-        <Border DockPanel.Dock="Top" Padding="5">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Content="{Binding SimulationToggleText}"
-                        Command="{Binding SimulationToggleCommand}"
-                        Background="{Binding SimulationButtonColor}"
-                        Margin="5,0" />
-                <Button Content="{Binding GridToggleText}"
-                        Command="{Binding GridToggleCommand}"
-                        Margin="5,0" />
-            </StackPanel>
-        </Border>
-
-        <!-- Bottom Status Bar -->
-        <Border Background="DarkSlateGray" Height="25" DockPanel.Dock="Bottom" Padding="5">
-            <Grid>
-                <!-- Left-aligned items -->
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                    <TextBlock Text="File Name: " />
-                    <TextBlock Text="{Binding OpenedFileName}" Margin="5,0" />
-                    <TextBlock Text="|" Margin="5,0" />
-                    <TextBlock Text="Cursor: " />
-                    <TextBlock Text="{Binding CursorPosition}" Margin="2,0" />
-                </StackPanel>
-
-                <!-- Right-aligned item -->
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <TextBlock Text="Last Action: " />
-                    <TextBlock Text="{Binding LastAction}" Margin="2,0" />
-                </StackPanel>
-            </Grid>
-        </Border>
-
-
-        <!-- Main Canvas Area -->
-        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-            <Canvas x:Name="MainCanvas" Background="LightGray" MinWidth="2000" MinHeight="2000">
-                <!-- Circuit elements will be added here programmatically -->
-
-                <!-- Context Menu Setup -->
-                <Canvas.ContextFlyout>
-                    <MenuFlyout>
-                        <MenuItem Header="Copy"
-                                  Command="{Binding CopyCommand}"
-                                  InputGesture="{Binding KeyConfig.Entries[Copy]}">
-                            <MenuItem.Icon>
-                                <PathIcon Data="{StaticResource copy_regular}" />
-                            </MenuItem.Icon>
-                        </MenuItem>
-
-                        <MenuItem Header="Cut"
-                                  Command="{Binding CutCommand}"
-                                  InputGesture="{Binding KeyConfig.Entries[Cut]}">
-                            <MenuItem.Icon>
-                                <PathIcon Data="{StaticResource cut_regular}" />
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        
-                        <MenuItem Header="Paste"
-                                  Command="{Binding PasteCommand}"
-                                  InputGesture="{Binding KeyConfig.Entries[Paste]}">
-                            <MenuItem.Icon>
-                                <PathIcon Data="{StaticResource clipboard_paste_regular}" />
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        
-                        <MenuItem Header="Delete"
-                                  Command="{Binding DeleteCommand}"
-                                  InputGesture="{Binding KeyConfig.Entries[Delete]}">
-                            <MenuItem.Icon>
-                                <PathIcon Data="{StaticResource delete_regular}" />
-                            </MenuItem.Icon>
-                        </MenuItem>
-                        
-                    </MenuFlyout>
-                </Canvas.ContextFlyout>
-            </Canvas>
-        </ScrollViewer>
-    </DockPanel>
-
-
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:IRis.ViewModels"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="using:FluentAvalonia.UI.Controls"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="IRis.Views.MainWindow"
+        x:DataType="vm:MainWindowViewModel"
+        Icon="/Assets/avalonia-logo.ico"
+        Title="IRis">
+
+    <Design.DataContext>
+        <!-- This only sets the DataContext for the previewer in an IDE,
+             to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
+        <vm:MainWindowViewModel />
+    </Design.DataContext>
+
+    <Window.KeyBindings>
+         
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[SaveFile]}" 
+                    Command="{Binding SaveCommand}"/>
+        
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[OpenFile]}" 
+                    Command="{Binding OpenCommand}"/>
+
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[NewFile]}" 
+                    Command="{Binding NewCommand}"/>
+       
+       
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Delete]}" 
+                    Command="{Binding DeleteCommand}" />
+        
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Unselect]}" 
+                    Command="{Binding AddComponentCommand}" 
+                    CommandParameter="NULL"/>
+        
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[OtherComponents]}" 
+                    Command="{Binding OtherComponentsCommand}"/>
+
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Copy]}" 
+                    Command="{Binding CopyCommand}"/>
+        
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Cut]}" 
+                    Command="{Binding CutCommand}"/>
+
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Paste]}" 
+                    Command="{Binding PasteCommand}"/>
+
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Undo]}" 
+                    Command="{Binding UndoCommand}"/>
+
+        <KeyBinding Gesture="{Binding KeyConfig.Entries[Redo]}" 
+                    Command="{Binding RedoCommand}"/>
+        
+        
+        <!-- <KeyBinding Gesture="{Binding KeyConfig.Entries[RotateClockwise]}"  -->
+        <!--             Command="{Binding RotatePreviewCompCommand}" -->
+        <!--             CommandParameter="C"/> -->
+        <!-- <KeyBinding Gesture="{Binding KeyConfig.Entries[RotateCounterClockwise]}"  -->
+        <!--             Command="{Binding RotatePreviewCompCommand}" -->
+        <!--             CommandParameter="AC"/> -->
+    </Window.KeyBindings>
+
+
+
+    <DockPanel>
+        <!-- Top Menu Bar -->
+        <!-- Top Menu Bar -->
+        <Menu DockPanel.Dock="Top">
+            <MenuItem Header="File" >
+
+                <MenuItem Header="New"
+                          Command="{Binding NewCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[NewFile]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource new_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Open..."
+                          Command="{Binding OpenCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[OpenFile]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource open_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Save"
+                          Command="{Binding SaveCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[SaveFile]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource save_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Save As..." Command="{Binding SaveAsCommand}" />
+
+                <Separator />
+                <MenuItem Header="Export" >
+                    
+                    <MenuFlyout></MenuFlyout>
+                        <MenuItem Header="Component" Command="{Binding ExportComponentCommand}" />
+                        <MenuItem Header="Circuit" Command="{Binding ExportCircuitCommand}" />
+                    
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource arrow_export_rtl_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+                <Separator />
+
+                <MenuItem Header="Exit" Command="{Binding ExitCommand}" />
+            </MenuItem>
+
+            <MenuItem Header="Edit">
+                <MenuItem Header="Undo"
+                          Command="{Binding UndoCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Undo]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource arrow_undo_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Redo"
+                          Command="{Binding RedoCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Redo]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource arrow_redo_regular}"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <Separator />
+
+                <MenuItem Header="Cut"
+                          Command="{Binding CutCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Cut]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource cut_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Copy"
+                          Command="{Binding CopyCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Copy]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource copy_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Paste"
+                          Command="{Binding PasteCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Paste]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource clipboard_paste_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem Header="Delete"
+                          Command="{Binding DeleteCommand}"
+                          InputGesture="{Binding KeyConfig.Entries[Delete]}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource delete_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+            <!-- AI option -->
+            <MenuItem Header="AI">
+                <MenuItem
+                    Header="Generate From Prompt"
+                    Command="{Binding AiPromptCommand}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource star_emphasis_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+                <MenuItem
+                    Header="Generate From Image"
+                    Command="{Binding AiImageCommand}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource image_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+
+            </MenuItem>
+
+            <MenuItem Header="Help">
+                <MenuItem Header="About" Command="{Binding AboutCommand}">
+                    <MenuItem.Icon>
+                        <PathIcon Data="{StaticResource question_regular}" />
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+        </Menu>
+
+
+        <!-- Left Sidebar with Components -->
+        <ScrollViewer DockPanel.Dock="Left" Width="150" BorderThickness="2">
+            <StackPanel Margin="5" Spacing="5">
+                <TextBlock Text="Components" FontWeight="Bold" Margin="0,5" />
+
+                <Button Content="AND Gate" Command="{Binding AddComponentCommand}" CommandParameter="AND" />
+                <Button Content="OR Gate" Command="{Binding AddComponentCommand}" CommandParameter="OR" />
+                <Button Content="NOT Gate" Command="{Binding AddComponentCommand}" CommandParameter="NOT" />
+                <Button Content="NAND Gate" Command="{Binding AddComponentCommand}" CommandParameter="NAND" />
+                <Button Content="NOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="NOR" />
+                <Button Content="XOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="XOR" />
+                <Button Content="XNOR Gate" Command="{Binding AddComponentCommand}" CommandParameter="XNOR" />
+                <Button Content="Other" Command="{Binding OtherComponentsCommand}" />
+
+                <TextBlock Text="Input/Output" FontWeight="Bold" Margin="0,10,0,5" />
+
+                <Button Content="Toggle Switch" Command="{Binding AddComponentCommand}" CommandParameter="TOGGLE" />
+                <Button Content="Logic Probe" Command="{Binding AddComponentCommand}" CommandParameter="PROBE" />
+
+                <TextBlock Text="Connectors" FontWeight="Bold" Margin="0,10,0,5" />
+
+                <Button Content="Wire" Command="{Binding AddComponentCommand}" CommandParameter="WIRE" />
+
+            </StackPanel>
+        </ScrollViewer>
+
+        <!-- Top Bar: Toolbar below menu -->
+        <Border DockPanel.Dock="Top" Padding="5">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                <Button Content="{Binding SimulationToggleText}"
+                        Command="{Binding SimulationToggleCommand}"
+                        Background="{Binding SimulationButtonColor}"
+                        Margin="5,0" />
+                <Button Content="{Binding GridToggleText}"
+                        Command="{Binding GridToggleCommand}"
+                        Margin="5,0" />
+            </StackPanel>
+        </Border>
+
+        <!-- Bottom Status Bar -->
+        <Border Background="DarkSlateGray" Height="25" DockPanel.Dock="Bottom" Padding="5">
+            <Grid>
+                <!-- Left-aligned items -->
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                    <TextBlock Text="File Name: " />
+                    <TextBlock Text="{Binding OpenedFileName}" Margin="5,0" />
+                    <TextBlock Text="|" Margin="5,0" />
+                    <TextBlock Text="Cursor: " />
+                    <TextBlock Text="{Binding CursorPosition}" Margin="2,0" />
+                </StackPanel>
+
+                <!-- Right-aligned item -->
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <TextBlock Text="Last Action: " />
+                    <TextBlock Text="{Binding LastAction}" Margin="2,0" />
+                </StackPanel>
+            </Grid>
+        </Border>
+
+
+        <!-- Main Canvas Area -->
+        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
+            <Canvas x:Name="MainCanvas" Background="LightGray" MinWidth="2000" MinHeight="2000">
+                <!-- Circuit elements will be added here programmatically -->
+
+                <!-- Context Menu Setup -->
+                <Canvas.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuItem Header="Copy"
+                                  Command="{Binding CopyCommand}"
+                                  InputGesture="{Binding KeyConfig.Entries[Copy]}">
+                            <MenuItem.Icon>
+                                <PathIcon Data="{StaticResource copy_regular}" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+
+                        <MenuItem Header="Cut"
+                                  Command="{Binding CutCommand}"
+                                  InputGesture="{Binding KeyConfig.Entries[Cut]}">
+                            <MenuItem.Icon>
+                                <PathIcon Data="{StaticResource cut_regular}" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        
+                        <MenuItem Header="Paste"
+                                  Command="{Binding PasteCommand}"
+                                  InputGesture="{Binding KeyConfig.Entries[Paste]}">
+                            <MenuItem.Icon>
+                                <PathIcon Data="{StaticResource clipboard_paste_regular}" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        
+                        <MenuItem Header="Delete"
+                                  Command="{Binding DeleteCommand}"
+                                  InputGesture="{Binding KeyConfig.Entries[Delete]}">
+                            <MenuItem.Icon>
+                                <PathIcon Data="{StaticResource delete_regular}" />
+                            </MenuItem.Icon>
+                        </MenuItem>
+                        
+                    </MenuFlyout>
+                </Canvas.ContextFlyout>
+            </Canvas>
+        </ScrollViewer>
+    </DockPanel>
+
+
 </Window>
\ No newline at end of file
diff --git a/Views/MainWindow.axaml.cs b/Views/Main/MainWindow.axaml.cs
similarity index 96%
rename from Views/MainWindow.axaml.cs
rename to Views/Main/MainWindow.axaml.cs
index cb256ce..a13b028 100644
--- a/Views/MainWindow.axaml.cs
+++ b/Views/Main/MainWindow.axaml.cs
@@ -1,21 +1,21 @@
-// MainWindow.axaml.cs
-using Avalonia.Controls;
-using IRis.Models;
-
-namespace IRis.Views;
-
-public partial class MainWindow : Window
-{
-    // This parameter-less constructor is not run from app.axaml.cs
-    // Otherwise it could cause errors
-    public MainWindow() : this(new Simulation()) {} // fallback for preview/designer/runtime
-
-    public MainWindow(Simulation simulation)
-    {
-        InitializeComponent();
-
-        // "MainCanvas" from the XAML is used for all the drawing
-        // Register this to the simulation object
-        simulation.Register(MainCanvas);
-    }
-}
+// MainWindow.axaml.cs
+using Avalonia.Controls;
+using IRis.Models;
+
+namespace IRis.Views;
+
+public partial class MainWindow : Window
+{
+    // This parameter-less constructor is not run from app.axaml.cs
+    // Otherwise it could cause errors
+    public MainWindow() : this(new Simulation()) {} // fallback for preview/designer/runtime
+
+    public MainWindow(Simulation simulation)
+    {
+        InitializeComponent();
+
+        // "MainCanvas" from the XAML is used for all the drawing
+        // Register this to the simulation object
+        simulation.Register(MainCanvas);
+    }
+}