updated index struc, added flat icons
resolved index conflicts