Changed Group By combo box to check box and other minor changes.