Reverted previous commit and applied patch from praecipitator instead
Fixed table layout, previously column with row span was narrower that without it with the same contents