improved cs-form  to include panels