various ui improvements