Fields difference refactor layout