Reorganized the add on menus