Added Waypoints. A header bar too.
More styling.