Adds category selection with sub-menus #1522