Adjusted a few different areas per Evan R's suggestions within the open MR for this branch.
Attach a file by drag & drop or click to upload
