Major layout rewrite