Added generation of navigation links