added switch + settings page