Improve UI and some work on feature to add new metric.