Move x axis to class

Changed x-axis titles and values to use ```PlotValue``` instead of hard-coded switch statements.