Add site favicon and cleanup grouping sites by type, #22.