Fixed nav bug again, removed old and unused nav code