Added sorting for panels based on row attribute
Added icon name and type to merge logic