Merge statistics and ui improvements