aligned the spans.

and removed stuff i failed with