ui improvements; etc