Add a general concept of layers and controls