Changed nav bar, this is still a work in progress. I have commented out a lot of code, maybe will remove it soon