[TASK] Advanced Settings / Gateway UI updates
Merge pull request #1589 from Mesrop/develop-ui-updates

[TASK] Advanced Settings / Gateway UI updates