Manage settings

pull request for manageSetting branch