Worked on Settings Page

Did some more things for settings page.