Style modification + added Waypoint into the file