Some GUI fixes and added GUI stuff for client