Modified makefile and basic window for Client