[WMM-1138] nav and form fixes