Complete layout redesign