new commits for navbar and language