add nav, fix java