Refactor UIFactories in GUIClient context