fixed layout in edit view
merge edit layout