added navigation styles and pages
fixed merge conflicts in footer