Layout

Applying new layout