Added lap distances, reintegrating nav view controllers