Navigation updates and JS fixes