Cleanup of layer config tool and fixed addition of existing static
layers.