Updated GUI and Client