use standard layout

Partial1
Partial2