Added missing stuff to new Navigation