UI tweaks.  Fix bugs in gif exporter.
merge conflict