Changes to settings page and debug