UI cleanup, export done