Some UX changes, first version of export