Fixed nav bar issue, working on routing