Improve the UX of edit broker config