Began restructuring settings page