nav and form fixes
Merge pull request #13 from harrisonbooj/WMM-1138

[WMM-1138] nav and form fixes