Further improve source context menu