ui improvements6