added nav stuff and js
add js
fixed merge