improved edit form collapsing to single column