Add Selection control back in and have drawing tools dynamically change based on feature type selected