Moved client.js inside index.html, some cosmetic changes