diff --git a/src/dlangide/tools/d/DEditorTool.d b/src/dlangide/tools/d/DEditorTool.d
index 6d3e731..62c8271 100644
--- a/src/dlangide/tools/d/DEditorTool.d
+++ b/src/dlangide/tools/d/DEditorTool.d
@@ -52,13 +52,11 @@ class DEditorTool : EditorTool
                 else {
                 	auto filename = outputLine[0 .. split];
                 	if(_frame !is null) {
-                		writeln("Well I'm trying");
                 		_frame.openSourceFile(filename);
                 		auto target = to!int(outputLine[split+1 .. $]);
         				auto destPos = byteOffsetToCaret(_frame.currentEditor.text(), target);
 
         				_frame.currentEditor.setCaretPos(destPos.line,destPos.pos);
-                		writeln("Well I tried");
                 	}
                 }
             }
diff --git a/src/dlangide/ui/commands.d b/src/dlangide/ui/commands.d
index 0fc3ec2..7ae97be 100644
--- a/src/dlangide/ui/commands.d
+++ b/src/dlangide/ui/commands.d
@@ -87,5 +87,5 @@ const Action ACTION_HELP_ABOUT = new Action(IDEActions.HelpAbout, "MENU_HELP_ABO
 const Action ACTION_WINDOW_CLOSE_ALL_DOCUMENTS = new Action(IDEActions.WindowCloseAllDocuments, "MENU_WINDOW_CLOSE_ALL_DOCUMENTS"c);
 const Action ACTION_CREATE_NEW_WORKSPACE = new Action(IDEActions.CreateNewWorkspace, "Create new workspace"d);
 const Action ACTION_ADD_TO_CURRENT_WORKSPACE = new Action(IDEActions.AddToCurrentWorkspace, "Add to current workspace"d);
-const Action ACTION_GO_TO_DEFINITION = new Action(IDEActions.GoToDefinition,  "GO_TO_DEFINITION"c, "edit-cut"c, KeyCode.KEY_G, KeyFlag.Control);
-const Action ACTION_GET_COMPLETIONS = new Action(IDEActions.GetCompletionSuggestions,  "GO_TO_DEFINITION"c, "edit-cut"c, KeyCode.KEY_G, KeyFlag.Shift);
\ No newline at end of file
+const Action ACTION_GO_TO_DEFINITION = new Action(IDEActions.GoToDefinition,  "GO_TO_DEFINITION"c, ""c, KeyCode.KEY_G, KeyFlag.Control);
+const Action ACTION_GET_COMPLETIONS = new Action(IDEActions.GetCompletionSuggestions,  "GO_TO_DEFINITION"c, ""c, KeyCode.KEY_G, KeyFlag.Control|KeyFlag.Shift);
\ No newline at end of file
diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d
index 9324d25..3520398 100644
--- a/src/dlangide/ui/frame.d
+++ b/src/dlangide/ui/frame.d
@@ -331,6 +331,9 @@ class IDEFrame : AppFrame {
 
 		editItem.add(ACTION_EDIT_PREFERENCES);
 
+        MenuItem navItem = new MenuItem(new Action(21, "MENU_NAVIGATE"));
+        navItem.add(ACTION_GO_TO_DEFINITION, ACTION_GET_COMPLETIONS);
+
         MenuItem projectItem = new MenuItem(new Action(21, "MENU_PROJECT"));
         projectItem.add(ACTION_PROJECT_SET_STARTUP, ACTION_PROJECT_REFRESH, ACTION_PROJECT_UPDATE_DEPENDENCIES, ACTION_PROJECT_SETTINGS);
 
@@ -352,6 +355,7 @@ class IDEFrame : AppFrame {
         mainMenuItems.add(fileItem);
         mainMenuItems.add(editItem);
         mainMenuItems.add(projectItem);
+        mainMenuItems.add(navItem);
         mainMenuItems.add(buildItem);
         mainMenuItems.add(debugItem);
 		//mainMenuItems.add(viewItem);
@@ -382,9 +386,6 @@ class IDEFrame : AppFrame {
         tb.addControl(cbBuildConfiguration);
         tb.addButtons(ACTION_PROJECT_BUILD);
 
-        tb.addButtons(ACTION_GO_TO_DEFINITION);
-        tb.addButtons(ACTION_GET_COMPLETIONS);
-
         tb = res.getOrAddToolbar("Edit");
         tb.addButtons(ACTION_EDIT_COPY, ACTION_EDIT_PASTE, ACTION_EDIT_CUT, ACTION_SEPARATOR,
                       ACTION_EDIT_UNDO, ACTION_EDIT_REDO, ACTION_EDIT_INDENT, ACTION_EDIT_UNINDENT);
diff --git a/views/res/i18n/en.ini b/views/res/i18n/en.ini
index cf89974..37ebfbd 100644
--- a/views/res/i18n/en.ini
+++ b/views/res/i18n/en.ini
@@ -55,6 +55,7 @@ MENU_HELP=&HELP
 MENU_HELP_VIEW_HELP=&View help
 MENU_HELP_ABOUT=&About
 GO_TO_DEFINITION=Go To Definition
+MENU_NAVIGATE=NAVIGATE
 
 TAB_LONG_LIST=Long list
 TAB_BUTTONS=Buttons