Style edits

Final updates from our design stand this morning

Branch can be deleted after merge.