Fixed navigation to avoid URL errors