Small updates to menu/nav code