Revert some edit form layout code.

Conflicts:

	xadmin/views/edit.py