changes to grouping updated css and add form