reorganize
added inline help and icons for checkboxes