Fix menu sorting issue and update code to reflect proper embeds.