Major alterations: total layout rebuild.