Changes to allow more stuff to work

Still learning the secure function thing but this pull will allow the site_settings to be working again plus a few misc changes. Condensed the site_settings pages for the api into one file rather then 2.