group class form and index page layout changed
Conflict resolved