working on footer, nav changes
merge conflict resolved