UI: Metrics in progress, minor structure changes