Moved gui into client