fix waypoints, update header styles