Fix layout for CloudWatch Metrics