Favorites and route menu update

Fully working and backwards compatible favorites, and route menu
labeling update.