Fixed header and switch to 940 grid

Layout is based on 940 so changed and fixed header overlap with z index.