Minor layout, consistency and wording changes

Some minor layout changes and wording suggestions.