Add favicon, fix a number of namespace issues