Changes to support multiple layers as well as to overlay layers in the interface