diff --git a/src/files.h b/src/files.h
index a20bb82..a1bb2b0 100644
--- a/src/files.h
+++ b/src/files.h
@@ -70,21 +70,24 @@ const std::string menuxml =
 "      <menu action=\"FileNewProject\">\n"
 "        <menuitem action=\"FileNewProjectCpp\"/>\n"
 "      </menu>\n"
+"      <separator/>\n"
 "      <menuitem action=\"FileOpenFile\"/>\n"
 "      <menuitem action=\"FileOpenFolder\"/>\n"
+"      <separator/>\n"
 "      <menuitem action=\"FileSave\"/>\n"
 "      <menuitem action=\"FileSaveAs\"/>\n"
 "      <separator/>\n"
 "      <menuitem action=\"FileQuit\"/>\n"
 "    </menu>\n"
 "    <menu action=\"EditMenu\">\n"
+"      <menuitem action=\"EditUndo\"/>\n"
+"      <menuitem action=\"EditRedo\"/>\n"
+"      <separator/>\n"
 "      <menuitem action=\"EditCopy\"/>\n"
 "      <menuitem action=\"EditCut\"/>\n"
 "      <menuitem action=\"EditPaste\"/>\n"
 "      <separator/>\n"
 "      <menuitem action=\"EditFind\"/>\n"
-"      <menuitem action=\"EditUndo\"/>\n"
-"      <menuitem action=\"EditRedo\"/>\n"
 "    </menu>\n"
 "    <menu action=\"SourceMenu\">\n"
 "      <menuitem action=\"SourceGotoLine\"/>\n"
@@ -97,6 +100,7 @@ const std::string menuxml =
 "    <menu action=\"ProjectMenu\">\n"
 "      <menuitem action=\"ProjectCompileAndRun\"/>\n"
 "      <menuitem action=\"ProjectCompile\"/>\n"
+"      <separator/>\n"
 "      <menuitem action=\"ProjectRunCommand\"/>\n"
 "      <menuitem action=\"ProjectKillLastRunning\"/>\n"
 "      <menuitem action=\"ProjectForceKillLastRunning\"/>\n"
diff --git a/src/source.cc b/src/source.cc
index da52d62..127205d 100644
--- a/src/source.cc
+++ b/src/source.cc
@@ -562,7 +562,7 @@ void Source::ClangViewParse::init_syntax_highlighting(const std::map<std::string
 
 std::map<std::string, std::string> Source::ClangViewParse::get_buffer_map() const {
   std::map<std::string, std::string> buffer_map;
-  buffer_map[file_path.string()]=get_source_buffer()->get_text().raw();
+  buffer_map[file_path.string()]=get_source_buffer()->get_text();
   return buffer_map;
 }