Move navigation into its own top-level category

Change-Id: I75411d0ea78950015684575c6a99f2e215fb6785
Remove navigation bar category strings

Change-Id: Idc3ba954b9cbdac864cbaa5eae6b9c513f0cd27c