Fixed AddEditLayout bug