ui improvements 2