Restructured layout
Bloat cleanup