Upgrade settings view for #3176