changed navbar
merge commits