Add switches to admin
Fix editionalisation issue