Adjusted order of categories and Nav.