Groups split up, integrated further, fixed indents, removed borders, alignment