Added option to allow for grouping, including in print view. Option is in Option dialog.
Minor refactor
merging conflict