More work on UI import/export