Moving GUI stuff into the client package