Remove unused div
Fix add/edit template for calls to properly close the divs