Added context menu with "Save" and "Close", Issue #31