Flux Layout - Label variables and simplify

Label up variables and change output config arrays to simplify output.