toolbar refactor for populate and fixes admin tree menus

fixes #2479