Graph refactoring + added menus to separate them