worked on navbar more
moved images again
nav fixes
fixed merge conflicts
merging in new nav stuff