use layout

Partial1
Partial2