Misc changes and New Nav