fixed nav & edited layout