A few more modifications and removing javascript