Added 'rendering' selection
Fixed some grouping issues