Merge "add navigation to menu again"