Client GUI Fixes!