ui improvements[2]