Fixed a couple of styling/copy issues

[ based on: 52eb9e28e9ee04558006608b6a0f0092a2fe61de ]