Remove piwik code.
More modifications to the screens according to holgers screenshots.