Tidy up xaxis
Reorganize for reuse
Add normalized sorted plot and optimize query