improved client.js, minor changes on markup & server.js