fix nav menu
Merge remote branch 'origin/lila'