content add picker improvements
Merge pull request #84 from ray176/contentAddPickerImprovements

content add picker improvements