Started on improvements for the composite wizard
Added add rule + remove rule + select all functionality
All composite functionality working, but not fully tested and unrefactored
Bugfixes on the composite grid wizard