navbar improvements on xs
merge