Fixed context menu initialization