Merge navigation legend template changes from Euphorie.
Merge message box template changes from Euphorie.