New Layout Concept

- Rearrange the layout
- No-layout file now use the layout