Query UI clean up.  Added Validation and grouped form elements