add FeatureLayerControl

add some cleanup