Fix a few more layout nuisances (one word on a line, etc.)