Added Remove and Add functionalities to context menus