Minor code adjustments for Navigation bar width change