Working on ui improvements.