More plotting tweaks to use factorplot for timeseries