WLPROD-70: navigation/border update