fix navbar responsiveness
Fix merge