Re #1114 gws client ui refactoring