trying to merge
added fixed nav