Cleaning up detail.xml and edit.xml