css/js chnages as per amends from Marc Farrington