Fix big menu support for navbar.

Change-Id: I1050d23019f13cce6de92866f68ba290152345fb
OCD code audit