fixed context menu bug; fixed remove bug