Streamlining and simplification of layer builder.