restructured layout
new layout