Clean up and make Active Team settings page work