Changed site icon

Redirected old item URLs to new ones
Updated analytics code
Further template refactoring