Flux Layout - optimise code/output

Combine core grid classes with proportional classes and remove nice named columns = reduce complexity.