fix database and navigation system