Changes at navbar
Fixed conflicts