Added settings page
Merged settings with rest of app