Changes, cleanups and favicons fixes