more changes on content settings
Merge pull request #762 from viji-m/master

more changes on content settings