Demo build out, remaining pages, new nav