Updated gui and client server files