Style tweaks
Merge branch 'metrics-dashboard' into develop