Menu tweaks again