Merging in changes to logo and web.js