Updated changes to gui and server intergrations