added code for individual setting pages
merge changes