Changed name of NavigationServer back to Server