Adding user defined metrics
Modifiyin charts layout