simplyfied index.html and small changes