ui improvements and end chat bugfix