Added piwik tracking code, some minor changes