Added code to guard against step access without a valid ID and fixed some erros in nav links