Update nav and fix margins on all pages to accommodate the new nav