a few layout updated
a few layout updated