Added symbols to metrics, tweaked views