rotate x axis labels
merge fix
Merge fix2