diff --git a/src/SharpIDE.Photino/Components/CodeViewer.razor b/src/SharpIDE.Photino/Components/CodeViewer.razor
index 0079740..26f046d 100644
--- a/src/SharpIDE.Photino/Components/CodeViewer.razor
+++ b/src/SharpIDE.Photino/Components/CodeViewer.razor
@@ -1,6 +1,9 @@
 @using Ardalis.GuardClauses
 @using SharpIDE.Application.Features.SolutionDiscovery
 @using SharpIDE.Photino.Services
+@using BlazorMonaco
+@using BlazorMonaco.Editor
+@using BlazorMonaco.Languages
 
 @inject RefreshOpenFileService RefreshOpenFileService
 
diff --git a/src/SharpIDE.Photino/Components/SolutionExplorer.razor b/src/SharpIDE.Photino/Components/SolutionExplorer.razor
index d7cc939..720483a 100644
--- a/src/SharpIDE.Photino/Components/SolutionExplorer.razor
+++ b/src/SharpIDE.Photino/Components/SolutionExplorer.razor
@@ -13,19 +13,29 @@
 		transition-duration: 0.0s !important;
 	}
 </style>
-<MudTreeView T="ISharpIdeNode" Dense="true" ExpandOnClick="true">
-	<MudTreeViewItem T="ISharpIdeNode" TextTypo="Typo.body2" Expanded="true" Icon="@Icons.Material.Filled.Folder" IconColor="Color.Primary" Value="@SolutionModel" Text="@SolutionModel.Name">
-		@foreach (var folder in SolutionModel.Folders)
-		{
-			@GetSolutionFolderFragment(folder)
-		}
-		@foreach (var project in SolutionModel.Projects)
-		{
-			@GetProjectFragment(project)
-		}
-	</MudTreeViewItem>
-</MudTreeView>
-
+	<MudMenu Style="flex-direction: column; width: 100%" ActivationEvent="@MouseEvent.RightClick" PositionAtCursor="true" Dense="true" Modal="false">
+		<ActivatorContent>
+			<MudTreeView T="ISharpIdeNode" Dense="true" ExpandOnClick="true">
+				<MudTreeViewItem T="ISharpIdeNode" TextTypo="Typo.body2" Expanded="true" Icon="@Icons.Material.Filled.Folder" IconColor="Color.Primary" Value="@SolutionModel" Text="@SolutionModel.Name">
+					@foreach (var folder in SolutionModel.Folders)
+					{
+						@GetSolutionFolderFragment(folder)
+					}
+					@foreach (var project in SolutionModel.Projects)
+					{
+						@GetProjectFragment(project)
+					}
+				</MudTreeViewItem>
+			</MudTreeView>
+		</ActivatorContent>
+		<ChildContent>
+			<MudMenuItem Icon="@Icons.Material.Filled.PlayArrow" IconColor="Color.Success" Label="Run" />
+			<MudMenuItem Label="Build" />
+			<MudMenuItem Label="Rebuild" />
+			<MudMenuItem Label="Clean" />
+			<MudMenuItem Label="Restore" />
+		</ChildContent>
+	</MudMenu>
 
 @code {
 	[Parameter, EditorRequired]
diff --git a/src/SharpIDE.Photino/_Imports.razor b/src/SharpIDE.Photino/_Imports.razor
index 7863d5f..df8c6af 100644
--- a/src/SharpIDE.Photino/_Imports.razor
+++ b/src/SharpIDE.Photino/_Imports.razor
@@ -10,6 +10,3 @@
 @using MudBlazor
 @using SharpIDE.Photino.Layout
 @using SharpIDE.Photino.Components
-@using BlazorMonaco
-@using BlazorMonaco.Editor
-@using BlazorMonaco.Languages