Further integration

Include waypoint, meta, title and texts + structure adjustments