Merging the initial work on Settings page.