Matrix layout design changes