Updated tags

Also updated the javascript load for some pages to actually reduce it :D