Mostly complete markup of V2 wireframes.