Add Matrix layout