Update the appearance and layou
Merge