nav done
more changes