Modified nav generation some more