added nav, fixed 1