Added more metrics
Updated UI