Refined layout
Regined layout