tweaking to get collapse and submit to work together