Issue Deselect MENU + clean up ADD