Include jquery, optimisation of javascript and headers

Change-Id: I55db94e115c97aa93d0dacd8be48e25a454501cc