Working towards fully functional settings page.
Fix merge conflict