mainly ui improvements