fix nav/form issue