Merge #50: Refactoring client_gui.py