Get rid of SiteLayout, move site.scss to app.scss

A step toward unification, remove the distinction between app and
site layouts.
Fix header styles for annotations after 352cc1d

This should have been qualified before, so that it only applied to
the main content header.