Major structure changes in ClientGUI