Fixed the overlap text in #339

Added Waypoint List Header