Set fixed X axis scale to avoid odd sizing
Merge branch 'dev'