[TASK] Advanced Settings / Gateway UI updates