Add picard metrics, fix alignment