Fixed Centering of Spans

also modified slightly other stuff
But
Modified markup to produce better working spans
May or may not be at all valid anymore, but, this just needs to work.
Merged with master