Updated js files
Updated php files/templates