Small JSP updates. Used form for grouping