More HTML/JS fixes for page navigation.