Tweaks for imenu