Partial fix sub-nav-kevin
Merged with dev