Update Master to Export/UI Changes

Do you think we need to test this further?
Use 2 spaces for indentation in a hash, relative to the start of the line where the left curly brace is.