Some changes in metrics layout.