Reorganice the categories and nav