Fixup grid miss-alignments, add spacing, fix spans

Several pages have been affected, nothing that is visually too crazy
(screenshot wouldn't really help).