moved navigation to end