refining the layoutz

Refining of the layout, added some partials.