added menu items for separate entries, cleanup