added groups, edited menu, edited index