custom x scale, gutters between groups, develop closer together
refactored scale into separate function
replaced diagonal last resort lines by lines running between the columns
Merge branch 'custom_x_scaling' into develop