navbar mobile
merge conflicts