Merge branch 'master' into iap
adjusted region labels
capitalized subheader string
adjusted lock icon
Merge branch 'master' into iap
cleaned grid borders
merged conflicts