Moved header back under main & massive updates to History.js