We had a few issues with some strings that caused inconsistency within the app and with the HIG. This commit fixes those up.