Tweaks for menu loop