Update Master to Export/UI Changes

Do you think we need to test this further?
Line is too long. [94/80]<br>Use 2 (not 1) spaces for indentation.<br>Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.