nav fix
calc fix