Complete work to move metric-picker in the cluster view, and fix a host display issue.