Merging changes for navbar