more tweaks

More tweaks to make spacing work consistently across page types with
differing markup.