Update Master to Export/UI Changes

Do you think we need to test this further?
Indent the right brace the same as the start of the line where the left brace is.