diff --git a/src/app/qt/window/QtMainWindow.cpp b/src/app/qt/window/QtMainWindow.cpp
index d89f2df8..aa41c9c7 100644
--- a/src/app/qt/window/QtMainWindow.cpp
+++ b/src/app/qt/window/QtMainWindow.cpp
@@ -404,9 +404,13 @@ void QtMainWindow::setupProjectMenu()
 	menu->addAction(tr("&Open Project..."), this, SLOT(openProject()), QKeySequence::Open);
 	menu->addAction(tr("&Edit Project..."), this, SLOT(editProject()));
 
+	menu->addSeparator();
+
 	menu->addAction(tr("&Save Project"), this, SLOT(saveProject()), QKeySequence::Save);
 	menu->addAction(tr("Save Project as..."), this, SLOT(saveAsProject()), QKeySequence::SaveAs);
 
+	menu->addSeparator();
+
 	menu->addAction(tr("&Close Window"), this, SLOT(closeWindow()), QKeySequence::Close);
 	menu->addAction(tr("E&xit"), QCoreApplication::instance(), SLOT(quit()), QKeySequence::Quit);
 }
@@ -424,9 +428,12 @@ void QtMainWindow::setupEditMenu()
 	QMenu *menu = new QMenu(tr("&Edit"), this);
 	menuBar()->addMenu(menu);
 
-	menu->addAction(tr("&Refresh"), this, SLOT(refresh()), QKeySequence::Refresh);
 	menu->addAction(tr("Undo"), this, SLOT(undo()), QKeySequence::Undo);
 	menu->addAction(tr("Redo"), this, SLOT(redo()), QKeySequence::Redo);
+
+	menu->addSeparator();
+
+	menu->addAction(tr("&Refresh"), this, SLOT(refresh()), QKeySequence::Refresh);
 	menu->addAction(tr("&Find"), this, SLOT(find()), QKeySequence::Find);
 }
 
diff --git a/src/lib/data/Storage.cpp b/src/lib/data/Storage.cpp
index 6f9498ad..36770e92 100644
--- a/src/lib/data/Storage.cpp
+++ b/src/lib/data/Storage.cpp
@@ -228,8 +228,7 @@ Id Storage::onFieldParsed(const ParseLocation& location, const ParseVariable& va
 	addSourceLocation(nodeId, location);
 
 	Id typeNodeId = addNodeHierarchy(Node::NODE_UNDEFINED_TYPE, variable.type.dataType->getTypeNameHierarchy());
-
-	addEdge(nodeId, typeNodeId, Edge::EDGE_TYPE_OF, location);
+	addEdge(nodeId, typeNodeId, Edge::EDGE_TYPE_OF, variable.type.location);
 
 	return nodeId;
 }
@@ -325,7 +324,7 @@ Id Storage::onMethodOverrideParsed(
 	Id baseNodeId = addNodeHierarchyWithDistinctSignature(Node::NODE_UNDEFINED_FUNCTION, base); // TODO: call this overridden
 	Id overriderNodeId = addNodeHierarchyWithDistinctSignature(Node::NODE_UNDEFINED_FUNCTION, overrider);
 
-	Id edgeId = addEdge(baseNodeId, overriderNodeId, Edge::EDGE_OVERRIDE, location);
+	Id edgeId = addEdge(overriderNodeId, baseNodeId, Edge::EDGE_OVERRIDE, location);
 
 	return edgeId;
 }