Minor wording changes

Some of the layout changes are hideously kludgy but they do what I want them to :)