Added category specific icons, update js to reflect category change
Merge branch 'master' into gh-pages