Layout update

layout is complet