edition support, ui improvements