Group and Details done

with lots of bugs