Some changes to context menu