Fixed Nav issues, added Name Spacing