Fixed Nav bug and line endings...