Layout redesigned