Cleaned-up GUI client