clean up composite elements slightly  
clean up checkbox