Added waypoints and changed header layout